summaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_blend.c
Commit message (Collapse)AuthorAgeFilesLines
* libavfilter/vf_blend: do not unconditionally compile both filtersPaul B Mahol2015-01-051-12/+20
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/vf_blend: Fix AVClassMichael Niedermayer2014-12-271-1/+1
| | | | | | Fixes infinite loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi: add tblend filterStefano Sabatini2014-12-271-41/+119
|
* lavfi/blend: add difference128 modeStefano Sabatini2014-12-261-0/+4
|
* avfilter/vf_blend: fix macro ()Michael Niedermayer2014-06-221-4/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavfi: do not export the filters from shared objects Conflicts: libavfilter/af_amix.c libavfilter/af_anull.c libavfilter/asrc_anullsrc.c libavfilter/f_select.c libavfilter/f_settb.c libavfilter/split.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_colorbalance.c libavfilter/vf_copy.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_drawbox.c libavfilter/vf_format.c libavfilter/vf_framestep.c libavfilter/vf_frei0r.c libavfilter/vf_hflip.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_null.c libavfilter/vf_overlay.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_vflip.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* avfilter/dualinput: simplifyPaul B Mahol2013-09-301-10/+4
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi/dualinput: reimplement on top of framesync.Nicolas George2013-09-231-0/+4
|
* avfilter: various cosmeticsPaul B Mahol2013-09-121-7/+7
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi/blend: use dual input helpersPaul B Mahol2013-07-061-106/+77
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi/blend: support slice threadingPaul B Mahol2013-05-241-26/+53
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi/blend: fix SW/SH calculationPaul B Mahol2013-05-241-2/+2
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi/blend: add yuv(j)411pPaul B Mahol2013-05-241-2/+2
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi/blend: timeline supportPaul B Mahol2013-05-141-5/+11
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi: use ceil right shift for chroma width/height.Clément Bœsch2013-05-101-2/+2
| | | | | | | This should fix several issues with odd dimensions inputs. lut, vflip, pad and crop video filters also need to be checked for such issues. It's possible sws is also affected.
* lavfi: add gbrap support to some filtersPaul B Mahol2013-05-081-1/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi/blend: merge config_input_top into config_outputPaul B Mahol2013-05-021-12/+7
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi/blend: use correct way to check number of planesPaul B Mahol2013-05-021-2/+4
| | | | | | | This fix crash with gray, as its marked as pseudopal, and thus have extra plane. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi: add frame counter into AVFilterLink and use it in filters.Clément Bœsch2013-04-231-2/+1
|
* lavfi: remove now unused args parameter from AVFilter.init and init_opaqueMichael Niedermayer2013-04-121-1/+1
| | | | | | | | | 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>
* lavfi/blend: support more yuv pixel formatsPaul B Mahol2013-04-111-1/+2
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi/blend: switch to AVOption-based systemMatthieu Bouron2013-04-111-3/+0
|
* lavfi/blend,noise: remove unedeed av_opt_free() callPaul B Mahol2013-04-081-1/+0
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi/blend: use standard options parsingPaul B Mahol2013-04-051-6/+3
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavfi/blend: add N variablePaul B Mahol2013-04-041-2/+4
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* blend: Adding yuvj pixelformats to the blend effectBjörn S2013-03-251-1/+1
| | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavfi/blend: always peek the first frame of each queue.Clément Bœsch2013-03-221-3/+3
| | | | | | Before the change, filter_frame() always waited for 2 samples in the bottom frames queue. This notably fixes commands such as ./ffplay tests/lena.pnm -vf split,blend=c0_mode=addition
* Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-101-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* blend filterPaul B Mahol2013-02-211-0/+474
Signed-off-by: Paul B Mahol <onemda@gmail.com>
OpenPOWER on IntegriCloud