summaryrefslogtreecommitdiff
path: root/libavfilter/avfilter.c
Commit message (Collapse)AuthorAge
...
* | Merge commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec'Michael Niedermayer2013-04-10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a39c154049a2d0c4fb02a5c74f58d6986ec21cec': vf_fieldorder: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_fieldorder.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd'Michael Niedermayer2013-04-10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd': vf_fade: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_fade.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a'Michael Niedermayer2013-04-10
|\| | | | | | | | | | | | | | | | | | | * commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a': vf_drawtext: switch to an AVOptions-based system. Conflicts: libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '335c31293baec6e6cf5907bd29840af3de8ff735'Michael Niedermayer2013-04-10
|\| | | | | | | | | | | | | | | | | | | | | * commit '335c31293baec6e6cf5907bd29840af3de8ff735': vf_drawbox: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_drawbox.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e'Michael Niedermayer2013-04-10
|\| | | | | | | | | | | | | | | | | | | * commit '63e58c55c17d7f8b5eec9c082fe0f8edc305a24e': vf_delogo: switch to an AVOptions-based system. Conflicts: libavfilter/vf_delogo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd'Michael Niedermayer2013-04-10
|\| | | | | | | | | | | | | | | | | | | | | * commit '460e7b4f6d473d9f03ed45501221f9cb209b28fd': vf_cropdetect: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_cropdetect.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891'Michael Niedermayer2013-04-10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'fba0156af77b11ec99edf4ee8f511b7aaa6b1891': vf_crop: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_crop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '51def31dbe5b6e857536de8fa428f263d64f3ae5'Michael Niedermayer2013-04-10
|\| | | | | | | | | | | | | | | | | | | | | * commit '51def31dbe5b6e857536de8fa428f263d64f3ae5': vf_boxblur: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_boxblur.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: support alternative keys in the alternative shorthand systemMichael Niedermayer2013-04-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '62dcdb028cc84845fd263bb09304c4c6500bda7a'Michael Niedermayer2013-04-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '62dcdb028cc84845fd263bb09304c4c6500bda7a': vf_blackframe: switch to an AVOptions-based system. vf_aspect: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_aspect.c libavfilter/vf_blackframe.c In the aspect filter most changes are merged but not the final switch to the libav API because that is too restrictive and has difficulty handling the syntax. Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af'Michael Niedermayer2013-04-10
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e67a87eac814c7805d18c983c43033a8a1bd62af': vf_(no)format: switch to an AVOptions-based system. af_aformat: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/af_aformat.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_(no)format: switch to an AVOptions-based system.Anton Khirnov2013-04-09
| |
* | Merge commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff'Michael Niedermayer2013-04-10
|\| | | | | | | | | | | | | | | | | | | * commit '4fa1f52e33b70029e2b621852f3af7c1ef9aecff': af_resample: switch to an AVOptions-based system. Conflicts: libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_resample: switch to an AVOptions-based system.Anton Khirnov2013-04-09
| |
* | Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525'Michael Niedermayer2013-04-10
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'b439c992c23f3e0f3832fffd2a34a664b236c525': lavfi: switch to an AVOptions-based system. dfa: implement missing TDLT coding method Conflicts: libavcodec/dfa.c libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: switch to an AVOptions-based system.Anton Khirnov2013-04-09
| |
| * lavfi: use designated initializers in avfilter_classAnton Khirnov2013-03-16
| |
* | lavfi: reindent after last commit.Nicolas George2013-04-03
| |
* | lavfi: loop on request_frame if necessary.Nicolas George2013-04-03
| | | | | | | | | | | | | | Some filters need several input frames before producing output. For these filter, it becomes simpler to return 0 in request_frame() and let the framework call it again until output has been produced.
* | lavfi: add common code to handle options parsing.Nicolas George2013-03-20
| |
* | lavfi/avfilter: raise filter_frame() error.Clément Bœsch2013-03-13
| |
* | avfilter: remove unused variableMichael Niedermayer2013-03-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: avoid direct access to "frame"->channelsMichael Niedermayer2013-03-10
| | | | | | | | | | | | This avoids ABI issues Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavfi: switch to AVFrame.Anton Khirnov2013-03-08
| | | | | | | | | | Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it and use AVFrame instead.
* | avfilter: Silence warning: passing argument 3 of av_image_copy from ↵Michael Niedermayer2013-02-23
| | | | | | | | | | | | incompatible pointer type Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: increment max number of registered filters from 128 to 256Stefano Sabatini2013-01-31
| | | | | | | | The total number of implemented filters is already over 128.
* | lavfi: fix null checking in avfilter_config_links()Xi Wang2013-01-21
| | | | | | | | | | | | | | | | Move the first use of `link' after the null pointer check. Signed-off-by: Xi Wang <xi.wang@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: fix use-after-free in ff_filter_frame.Nicolas George2013-01-08
| | | | | | | | | | | | | | Unlike the original ff_start_frame code, the incoming reference may be freed before that point. Fix CID966654.
* | lavfi: merge all filtering code into ff_filter_frame.Nicolas George2013-01-01
| |
* | lavfi: remove some draw_slice related code that has become unneededMichael Niedermayer2012-12-30
| | | | | | | | | | Reviewed-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: remove init and check of rate and layout.Nicolas George2012-12-20
| | | | | | | | | | The sample rate and channel layout are negotiated and set by the filter graph system.
* | lavfi: add a channels field to AVFilterLink.Nicolas George2012-12-20
| | | | | | | | | | Also: fix af_pan and af_aresample, that forgot to update audio->channels.
* | Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666'Michael Niedermayer2012-11-29
|\| | | | | | | | | | | | | | | | | | | | | | | The commit has already been split and commited, this merge is just for metadata. What has not been merged is the removial of some start/end_frame / draw_slice related functions that are still in use. They can be removed once they are unused. * commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666': lavfi: merge start_frame/draw_slice/end_frame Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: merge start_frame/draw_slice/end_frameAnton Khirnov2012-11-28
| | | | | | | | | | Any alleged performance benefits gained from the split are purely mythological and do not justify added code complexity.
* | libavfilter: Support using filter_frame for videoMichael Niedermayer2012-11-28
| | | | | | | | | | | | With this we can mix filters using filter_frame OR start/draw_slice/end Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: check that filter_frame and slice variants are not both usedMichael Niedermayer2012-11-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: replace filter_samples by filter_frameMichael Niedermayer2012-11-28
| | | | | | | | | | Based on patch by Anton Khirnov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97bf7c03b1338a867da52c159a2afecbdedcfa88': doc: git-howto: Leave reviewers time to react before pushing patches Include libavutil/channel_layout.h instead of libavutil/audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/git-howto.texi ffmpeg_filter.c libavcodec/flacdec.c libavcodec/imc.c libavcodec/mpegaudiodec.c libavcodec/utils.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffer.c libavutil/Makefile libavutil/audioconvert.h libavutil/channel_layout.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Include libavutil/channel_layout.h instead of libavutil/audioconvert.hJustin Ruggles2012-11-11
| | | | | | | | Also reorder some other #include when applicable.
* | Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'Michael Niedermayer2012-10-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627': lavfi: do not use av_pix_fmt_descriptors directly. Conflicts: libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/filtfmts.c libavfilter/vf_ass.c libavfilter/vf_boxblur.c libavfilter/vf_drawtext.c libavfilter/vf_lut.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: do not use av_pix_fmt_descriptors directly.Anton Khirnov2012-10-12
| |
* | Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov2012-10-08
| |
* | Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'Michael Niedermayer2012-09-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521': alsdec: Check k used for rice decoder. avfiltergraph: silence an uninitialized variable warning xsubenc: reindent lavc: replace AVCodecContext.encode with subtitle-specific callback lavc: add const to private codec class initialization. avconv: don't pass a bogus parameter to avfilter_graph_create_filter(). id3v2: strdup the genre name explicitly. lavf/id3v2: do not export empty fields. buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame() lavfi: replace empty input/output lists with null pointers Conflicts: ffmpeg_filter.c libavcodec/alsdec.c libavcodec/dvdsubenc.c libavcodec/utils.c libavcodec/v210dec.h libavfilter/af_channelsplit.c libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_ass.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: replace empty input/output lists with null pointersMans Rullgard2012-09-17
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | lavfi: when configuring a link, set channel layout from previous link if ↵Stefano Sabatini2012-09-02
| | | | | | | | | | | | | | | | | | unspecified In avfilter_config_links(), if the current channel layout is not specified, set the same value of the previous link in the filterchain. Consistent with the logic used to set the other link parameters.
* | lavfi: free partial audio buffers when destroying links.Nicolas George2012-08-22
| | | | | | | | | | Fix a memleak that the recent change of architecture made more likely to happen.
* | lavfi: add a closed field to AVFilerLink.Nicolas George2012-08-22
| | | | | | | | It will help forward errors and maintain consistency.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 00:02:29 +0000