summaryrefslogtreecommitdiff
path: root/libavfilter
Commit message (Collapse)AuthorAge
* Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'Michael Niedermayer2013-03-12
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '7b89cd20d844cbe763ca34e63e99d110043cf241': eamad: allocate a dummy reference frame when the real one is missing Replace remaining includes of audioconvert.h with channel_layout.h Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*. Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace remaining includes of audioconvert.h with channel_layout.hAnton Khirnov2013-03-08
| |
* | Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111': Add the bumps and APIchanges entries for reference counted buffers changes. Conflicts: Changelog doc/APIchanges libavcodec/version.h libavdevice/version.h libavfilter/version.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add the bumps and APIchanges entries for reference counted buffers changes.Anton Khirnov2013-03-08
| |
* | lavfi/moviesrc: use refcounted framesHendrik Leppkes2013-03-12
| |
* | lavfi/buffersink: move the filter structures at the end.Nicolas George2013-03-11
| | | | | | | | | | Also apply a few cosmetic fixes (spaces, trailing comma) to help match them with the fork's implementation.
* | lavfi/buffersink: implement av_buffersink_get_samples().Nicolas George2013-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: the implementation could be more efficient, but at the cost of more diff. Most of the code from the following commit: commit a2cd9be212fca02dd3d6ee65cb6ab9f84c5e28e5 Author: Anton Khirnov <anton@khirnov.net> Date: Fri May 4 19:22:38 2012 +0200 lavfi: add an audio buffer sink. Adapted to call av_buffersink_get_frame_flags() instead of accessing the frame directly.
* | lavfi/buffersrc: do not dereference NULL frame.Nicolas George2013-03-10
| | | | | | | | frame = NULL is used to indicate EOF.
* | lavfi: rename sink_buffer.c into buffersink.c.Nicolas George2013-03-10
| |
* | lavfi: remove buffersink.c.Nicolas George2013-03-10
| | | | | | | | | | It only contains merge conflicts leftovers. The real code is in sink_buffer.c.
* | lavfi/sink_buffer: move stuff to reduce the diff.Nicolas George2013-03-10
| | | | | | | | | | | | Note: av_buffersink_get_samples() is not yet implemented, abuffersink is not yet a drop-in replacement of the fork's abuffersink.
* | lavfi/smartblur: add support to named optionsStefano Sabatini2013-03-10
| |
* | lavfi/buffersrc: implement flags.Nicolas George2013-03-10
| | | | | | | | | | | | | | | | | | | | | | | | The PUSH flags is necessary for efficient scheduling; otherwise there is no feedback when adding frames to closed paths. The NO_CHECK_FORMAT is a small optimization that does not cost much to implement. The KEEP_REF flag maps to the add/write distinction in the fork's API.
* | lavfi/unsharp: add missing option flagsStefano Sabatini2013-03-10
| |
* | avfilter: avoid direct access to "frame"->channelsMichael Niedermayer2013-03-10
| | | | | | | | | | | | This avoids ABI issues Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/pad: avoid buffer overflow in buffer_needs_copy()Xi Wang2013-03-10
| | | | | | | | | | | | | | Replace & with short-circuit &&. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | lavfi: add curves filter.Clément Bœsch2013-03-10
| |
* | lavfi: bump minor version after the first round of evil changes.Clément Bœsch2013-03-10
| |
* | sink_buffer: remove unused variablesMichael Niedermayer2013-03-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: remove remaining forgotten min/rej perms.Clément Bœsch2013-03-10
| |
* | lavfi/hue: reindent.Clément Bœsch2013-03-10
| |
* | lavfi/hue: add an optimized direct path.Clément Bœsch2013-03-10
| |
* | 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.
* | lavfi/showspectrum: fix outpicref initialization.Clément Bœsch2013-03-09
| | | | | | | | | | | | | | | | In 81f2549, output pixel format was changed from rgb24 to planar yuv, but the initialization was left unchanged. As a result, the chroma planes were left uninitalized. This was not noticed since the current ff_get_video_buffer() seems to be initializing the buffer. This won't be the case anymore after the Evil Plan.
* | Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'Michael Niedermayer2013-03-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'efa7f4202088c70caba11d7834641bc6eaf41830': Use the avstring.h locale-independent character type functions avstring: Add locale independent versions of some ctype.h functions Conflicts: avprobe.c doc/APIchanges libavcodec/dvdsubdec.c libavcodec/utils.c libavutil/avstring.c libavutil/avstring.h libavutil/eval.c libavutil/parseutils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use the avstring.h locale-independent character type functionsReimar Döffinger2013-03-07
| | | | | | | | | | | | Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <martin@martin.st>
* | vf_stereo3d: Add AVOption table terminatorMichael Niedermayer2013-03-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/deshake: support named options.Clément Bœsch2013-03-05
| |
* | lavfi/overlay: improve log message warning in case of clipped overlayStefano Sabatini2013-03-05
| |
* | lavfi/overlay: add support for partial overlayingStefano Sabatini2013-03-05
| | | | | | | | | | Partially rework the iteration logic, in order to limit iteration only for the clipped overlay region.
* | lavfi/mp: drop mp=stereo3d filterPaul B Mahol2013-03-05
| | | | | | | | | | | | The filter has been natively integrated into libavfilter. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi: port MP stereo3d filterPaul B Mahol2013-03-05
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/opencv: isgraph -> av_isgraph.Clément Bœsch2013-03-03
| | | | | | | | Fix build after 88d55b8.
* | Remove incorrect use of ctype.h functions.Reimar Döffinger2013-03-03
| | | | | | | | | | | | | | As far as I can tell the code should not change behaviour depending on locale in any of these places. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | lavfi/af_aresample: fix info log for unknown layouts.Nicolas George2013-02-28
| |
* | lavfi/af_aresample: fix layout consistency check.Nicolas George2013-02-28
| | | | | | | | | | If the channel layout is unknown, lswr will internally use the default one for the corresponding number of channels.
* | vf_lut: correct color/comp permutationMichael Niedermayer2013-02-27
| | | | | | | | | | | | Fixes Ticket2225 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/hflip: support more formatsPaul B Mahol2013-02-25
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/geq: improve support for formats with alpha planePaul B Mahol2013-02-25
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | af_biquads: memset(0) cacheMichael Niedermayer2013-02-25
| | | | | | | | | | | | Fixes valgrind warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/abuffersink: fix weird indent and spacingStefano Sabatini2013-02-24
| |
* | lavfi/abuffersink: add sample_rates field to AVABufferSinkParamsStefano Sabatini2013-02-24
| | | | | | | | Allow to select sample rates.
* | avfilter/avfiltergraph.h: Move public field out of the private fieldsMichael Niedermayer2013-02-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'Michael Niedermayer2013-02-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '9f1223562e134bac6345a465870b9d56ff7d60cf': lavfi: connect libavresample options to af_resample via AVFilterGraph Conflicts: doc/APIchanges libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: connect libavresample options to af_resample via AVFilterGraphJustin Ruggles2013-02-23
| |
* | lavfi/formats: reindent after last commit.Nicolas George2013-02-24
| |
* | lavfi: fix merging of formats and clarify exception.Nicolas George2013-02-24
| | | | | | | | | | | | | | | | The following commit: b97d61f avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha introduced an exception to avoid lossy conversions. Add a comment to explain the logic. Fix the call to avoid applying it on audio formats.
* | libavfilter/af_amerge: fix segfault if init fails.Nicolas George2013-02-24
| |
* | vf_mp: Set pseudo palMichael Niedermayer2013-02-23
| | | | | | | | | | | | | | Fixes ticket2140 Fixes null pointer dereference Signed-off-by: Michael Niedermayer <michaelni@gmx.at>