summaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_overlay.c
Commit message (Expand)AuthorAgeFilesLines
* lavfi/overlay: fix debug PTS output in try_filter_frame()Stefano Sabatini2013-03-311-3/+2
* lavfi/overlay: use standard options parsing.Clément Bœsch2013-03-241-11/+3
* lavfi: remove remaining forgotten min/rej perms.Clément Bœsch2013-03-101-1/+0
* Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-101-15/+14
|\
| * lavfi: switch to AVFrame.Anton Khirnov2013-03-081-19/+16
| * lavfi: merge start_frame/draw_slice/end_frameAnton Khirnov2012-11-281-27/+7
* | lavfi/overlay: improve log message warning in case of clipped overlayStefano Sabatini2013-03-051-1/+2
* | lavfi/overlay: add support for partial overlayingStefano Sabatini2013-03-051-36/+62
* | vf_overlay: silence warning: X may be used uninitialized in this functionMichael Niedermayer2013-02-231-0/+2
* | lavfi/overlay: add format optionStefano Sabatini2013-02-201-13/+42
* | lavfi/overlay: apply minor consistency fixesStefano Sabatini2013-02-201-2/+2
* | lavfi/overlay: implement shortest optionStefano Sabatini2013-02-201-0/+4
* | lavfi/overlay: yuv444p & yuva444p supportPaul B Mahol2013-02-191-3/+11
* | lavfi/vf_overlay: check that filter_frame does not return EAGAIN.Nicolas George2013-01-101-0/+1
* | lavfi/overlay: make use of av_opt_set_from_string()Stefano Sabatini2012-12-221-26/+3
* | lavfi/overlay: switch to filter_frame APIStefano Sabatini2012-12-221-106/+32
* | lavfi: declare arrays that never change as static constPaul B Mahol2012-12-211-4/+4
* | lavfi/overlay: clarify/fix comment, add a few empty lines to ease readabilityStefano Sabatini2012-12-151-1/+3
* | lavfi/overlay: remove duplicated definition of ff_null_get_video_buffer()Stefano Sabatini2012-12-151-6/+1
* | lavfi/overlay: enable yuva420p as overlay backgroundMark Himsley2012-11-271-10/+60
* | Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_...Hendrik Leppkes2012-10-201-1/+1
* | Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'Michael Niedermayer2012-10-121-3/+3
|\ \ | |/
| * lavfi: do not use av_pix_fmt_descriptors directly.Anton Khirnov2012-10-121-3/+3
* | Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer2012-10-111-22/+36
|\ \ | |/
| * lavfi: convert input/ouput list compound literals to named objectsMans Rullgard2012-10-101-24/+38
* | Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-081-14/+14
|\ \ | |/
| * Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov2012-10-081-5/+5
| * vf_overlay: properly sync inputs.Anton Khirnov2012-10-041-92/+115
* | Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b'Michael Niedermayer2012-10-041-21/+5
|\ \ | |/
| * vf_overlay: get rid of pointless messing with timebase.Anton Khirnov2012-10-041-21/+4
* | Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-051-1/+1
|\ \ | |/
* | lavfi/overlay: fix return values.Nicolas George2012-08-221-16/+34
* | lavfi: add priv class to filter definitions and flags to filter internal optionsStefano Sabatini2012-08-181-3/+5
* | vf_overlay: fix permissions.Nicolas George2012-08-171-4/+3
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-161-0/+1
|\ \ | |/
| * Don't include common.h from avutil.hMartin Storsjö2012-08-151-0/+1
| * vf_overlay: ensure the overlay frame does not get leaked.Anton Khirnov2012-07-261-0/+1
| * vf_overlay: prevent premature freeing of cur_bufMichael Niedermayer2012-07-261-0/+1
* | lavfi/overlay: remove dead initialization.Clément Bœsch2012-08-061-1/+1
* | vf_overlay: fix missed returnMichael Niedermayer2012-07-231-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-221-12/+16
|\ \ | |/
| * lavfi: check all avfilter_ref_buffer() calls for errors.Anton Khirnov2012-07-221-0/+3
| * lavfi: use avfilter_unref_bufferp() where appropriate.Anton Khirnov2012-07-221-2/+1
| * lavfi: add error handling to end_frame().Anton Khirnov2012-07-221-3/+6
| * lavfi: add error handling to draw_slice().Anton Khirnov2012-07-221-3/+6
| * lavfi: add error handling to start_frame().Anton Khirnov2012-07-221-3/+4
* | Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'Michael Niedermayer2012-07-221-23/+23
|\ \ | |/
| * lavfi: use const for AVFilterPad declarations in all filters.Ronald S. Bultje2012-07-211-23/+23
* | overlay: clear cur_buf on main input link.Nicolas George2012-07-221-1/+4
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-211-3/+0
|\ \ | |/
OpenPOWER on IntegriCloud