Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavfilter/vf_drawtext.c
AgeCommit message (Collapse)Author
2013-06-19add the start_number offset to var_values[VAR_N] directly, instead of adding ↵Mark Visser
it in func_frame_num
2013-06-15added start_number parameter to drawtext to permit an offset to n/frame_num varMark Visser
2013-05-24avfilter/vf_drawtext: Fix doxygen commentMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17lavfi/drawtext: switch to AV_OPT_TYPE_COLORPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-17Merge commit '3fb29588a27a711132106b924e27b53789a58dcb'Michael Niedermayer
* commit '3fb29588a27a711132106b924e27b53789a58dcb': vf_drawtext: don't leak the expressions. vf_crop: make config_props work properly when called multiple times. vf_setdar: make config_props work properly when called multiple times. Conflicts: libavfilter/vf_aspect.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17Merge commit '4c205f42c86ccefa093c59434669af34ad14a52b'Michael Niedermayer
* commit '4c205f42c86ccefa093c59434669af34ad14a52b': vf_drawbox: make config_props work properly when called multiple times. vf_drawtext: do not reset the frame number in config_input. vf_fps: move initializing pts from config_props to init. Conflicts: libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17vf_drawtext: don't leak the expressions.Anton Khirnov
2013-05-17vf_drawtext: do not reset the frame number in config_input.Anton Khirnov
Frame number should be incremented normally even if the link properties change.
2013-05-16Merge commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68'Michael Niedermayer
* commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68': vf_fade: use the name 's' for the pointer to the private context vf_drawtext: use the name 's' for the pointer to the private context vf_drawbox: use the name 's' for the pointer to the private context Conflicts: libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16vf_drawtext: use the name 's' for the pointer to the private contextAnton Khirnov
This is shorter and consistent across filters.
2013-04-23avfilter/drawtext: add pict_type supportMichael Niedermayer
Fixes Ticket2470 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-23lavfi: add frame counter into AVFilterLink and use it in filters.Clément Bœsch
2013-04-15lavfi/drawtext: make options array more readable.Clément Bœsch
2013-04-12lavfi: remove now unused args parameter from AVFilter.init and init_opaqueMichael Niedermayer
This is mostly automated global search and replace The deprecated aconvert filter is disabled, if it still has users it should be updated Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov
Conflicts: libavfilter/avfilter.c libavfilter/vf_drawtext.c libavfilter/vf_lut.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vsrc_color.c libavfilter/vsrc_movie.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10Merge commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a'Michael Niedermayer
* commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a': vf_drawtext: switch to an AVOptions-based system. Conflicts: libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-09lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov
2013-04-09vf_drawtext: switch to an AVOptions-based system.Anton Khirnov
2013-03-10Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer
* commit '7e350379f87e7f74420b4813170fe808e2313911': lavfi: switch to AVFrame. Conflicts: doc/filters.texi libavfilter/af_ashowinfo.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersink.c libavfilter/buffersrc.c libavfilter/buffersrc.h libavfilter/f_select.c libavfilter/f_setpts.c libavfilter/fifo.c libavfilter/split.c libavfilter/src_movie.c libavfilter/version.h libavfilter/vf_aspect.c libavfilter/vf_bbox.c libavfilter/vf_blackframe.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hqdn3d.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_vflip.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavfilter/yadif.h Following are notes about the merge authorship and various technical details. Michael Niedermayer: * Main merge operation, notably avfilter.c and video.c * Switch to AVFrame: - afade - anullsrc - apad - aresample - blackframe - deshake - idet - il - mandelbrot - mptestsrc - noise - setfield - smartblur - tinterlace * various merge changes and fixes in: - ashowinfo - blackdetect - field - fps - select - testsrc - yadif Nicolas George: * Switch to AVFrame: - make rawdec work with refcounted frames. Adapted from commit 759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov. Also, fix the use of || instead of | in a flags check. - make buffer sink and src, audio and video work all together Clément Bœsch: * Switch to AVFrame: - aevalsrc - alphaextract - blend - cellauto - colormatrix - concat - earwax - ebur128 - edgedetect - geq - histeq - histogram - hue - kerndeint - life - movie - mp (with the help of Michael) - overlay - pad - pan - pp - pp - removelogo - sendcmd - showspectrum - showwaves - silencedetect - stereo3d - subtitles - super2xsai - swapuv - thumbnail - tile Hendrik Leppkes: * Switch to AVFrame: - aconvert - amerge - asetnsamples - atempo - biquads Matthieu Bouron: * Switch to AVFrame - alphamerge - decimate - volumedetect Stefano Sabatini: * Switch to AVFrame: - astreamsync - flite - framestep Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Clément Bœsch <ubitux@gmail.com> Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08lavfi: switch to AVFrame.Anton Khirnov
Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it and use AVFrame instead.
2013-01-26lavfi/vf_drawtext: default to expansion=normal.Nicolas George
2012-12-06lavfi/drawtext: make use of outlink variable in filter_frame()Stefano Sabatini
Fix warning.
2012-12-05Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'Michael Niedermayer
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967': Remove pointless #undefs of previously forbidden functions. fate: Add dependencies for bmp, cdxl, dfa, mp3 Conflicts: doc/examples/muxing.c libavfilter/filtfmts.c libavutil/des.c libavutil/eval.c libavutil/log.c libavutil/parseutils.c tests/fate/mp3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05Remove pointless #undefs of previously forbidden functions.Anton Khirnov
2012-12-04lavfi/drawtext: add the reload option.Nicolas George
2012-11-28vf_drawtext: switch to filter_frame, this filter did not support slicesMichael Niedermayer
Based on patch by Anton Khirnov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28lavfi: merge start_frame/draw_slice/end_frameAnton Khirnov
Any alleged performance benefits gained from the split are purely mythological and do not justify added code complexity.
2012-11-28lavfi/drawtext: add support to expansion of generic expressionsStefano Sabatini
2012-11-22lavfi/drawtext: add support for printing frame numbersStefano Sabatini
Fix trac ticket #1949.
2012-11-18lavfi/drawtext: implement more generic expansion.Nicolas George
The new expansion mechanism uses the %{...} notation. For compatibility reasons, it must be enabled explicitly, but a warning is printed if a conflict is likely to happen.
2012-11-17lavfi/drawtext: use bprint for the expanded text.Nicolas George
2012-11-03Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'Michael Niedermayer
* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f': lavf: fix av_interleaved_write_frame() doxy. lavf: clarify the lifetime of demuxed packets. avconv: do not free muxed packet on streamcopy. crc: move doxy to the header vf_drawtext: do not use deprecated av_tree_node_size x86: Refactor PSWAPD fallback implementations and port to cpuflags Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-02vf_drawtext: do not use deprecated av_tree_node_sizeAnton Khirnov
2012-10-11drawtext: fix leak with timecodesMichael Niedermayer
Fixes CID733799 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer
* commit '4436f25a1682ada3f7226cb6fadf429946933161': build: remove references to unused EXTRAOBJS variable lavfi: convert input/ouput list compound literals to named objects fate: add h263 obmc vsynth tests avconv: remove bogus warning when using avconv -h without parameter averror: explicitly define AVERROR_* values flashsv: propagate inflateReset() errors indeo4/5: remove constant parameter num_bands from wavelet recomposition mxfdec: return error if no segments are available in mxf_get_sorted_table_segments Double motion vector range for HPEL interlaced picture in proper place Conflicts: libavcodec/v210dec.h libavfilter/af_aformat.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_channelmap.c libavfilter/af_join.c libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/f_setpts.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_select.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/vsrc_testsrc.c libavformat/mxfdec.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-11lavfi: convert input/ouput list compound literals to named objectsMans Rullgard
A number of compilers, for example those from TI and IBM, choke on these initialisers. The current style is also quite ugly. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-08Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov
2012-09-05Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer
* commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'Michael Niedermayer
* commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078': avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member Conflicts: libavcodec/libvpxenc.c libavcodec/options_table.h libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05Merge commit '124134e42455763b28cc346fed1d07017a76e84e'Michael Niedermayer
* commit '124134e42455763b28cc346fed1d07017a76e84e': avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member Conflicts: libavcodec/aacenc.c libavcodec/libopenjpegenc.c libavcodec/options_table.h libavdevice/bktr.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/vf_drawtext.c libavformat/movenc.c libavformat/options_table.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-05avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-09-05avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union memberMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-09-05avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union memberMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: utvideodec: Fix single symbol mode decoding truespeech: drop useless casts libavcodec: drop bogus dependencies from mpc[78] and qdm2 mpegaudio: move ff_mpa_enwindow to a separate file AVOptions: store defaults for INT64 options in int64 union member. Conflicts: libavcodec/Makefile libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-18lavfi: add priv class to filter definitions and flags to filter internal optionsStefano Sabatini
This allows the iteration callbacks to discover the internal class and options, and show them when required.
2012-08-17vf_drawtext: fix permissions.Nicolas George
2012-08-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-16Add more missing includes after removing the implicit common.hMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-09Remove "Error parsing options string [...]" messages.Clément Bœsch
This reduces from 3 to 2 messages for the same syntax error in ffprobe, and from 4 to 3 in filters.
2012-07-23Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: FATE: fix the asyncts test build: Drop gcc-specific warning flag from header compilation rule FATE: add a test for the asyncts audio filter. matroskadec: return more correct error code on read error. buffersrc: check ff_get_audio_buffer() for errors. lavfi: check all ff_get_video_buffer() calls for errors. lavfi: check all avfilter_ref_buffer() calls for errors. vf_select: avoid an unnecessary avfilter_ref_buffer(). buffersrc: avoid creating unnecessary buffer reference lavfi: use avfilter_unref_bufferp() where appropriate. vf_fps: add more error checks. vf_fps: fix a memleak on malloc failure. lavfi: check all ff_start_frame/draw_slice/end_frame calls for errors lavfi: add error handling to end_frame(). lavfi: add error handling to draw_slice(). lavfi: add error handling to start_frame(). Conflicts: Makefile ffplay.c libavfilter/buffersrc.c libavfilter/vf_boxblur.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_frei0r.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/video.c libavfilter/vsrc_color.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 06:22:41 +0300