summaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_overlay.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * lavfi: unref AVFilterLink.cur_buf in ff_end_frame().Anton Khirnov2012-07-201-1/+0
| * vf_overlay: don't access a buffer reference that's been given away.Anton Khirnov2012-07-201-2/+1
* | vf_overlay: prevent premature freeing of cur_bufMichael Niedermayer2012-07-211-0/+1
* | vf_overlay: use unref_bufferP()Michael Niedermayer2012-07-211-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-271-2/+2
|\ \ | |/
| * lavfi: make filters less verbose.Anton Khirnov2012-06-261-2/+2
* | Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'Michael Niedermayer2012-06-261-1/+1
|\ \ | |/
| * lavfi: remove 'opaque' parameter from AVFilter.init()Anton Khirnov2012-06-261-1/+1
* | lavfi: define macro AVFILTER_DEFINE_CLASSStefano Sabatini2012-06-221-7/+1
* | lavfi: use designated initializers for AVClassPaul B Mahol2012-06-171-3/+5
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-131-1/+1
|\ \ | |/
| * lavfi: make avfilter_get_video_buffer() private on next bump.Anton Khirnov2012-06-131-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-061-13/+15
|\ \ | |/
| * lavfi: remove request/poll and drawing functions from public API on next bumpAnton Khirnov2012-06-051-6/+7
| * lavfi: make formats API private on next bump.Anton Khirnov2012-06-051-5/+6
* | lavfi: use av_default_item_name() as filter private context loggerStefano Sabatini2012-06-041-1/+1
* | lavfi: add avfilter_default_filter_name()Stefano Sabatini2012-06-041-6/+1
* | vf_overlay: rewrite request/push logic.Nicolas George2012-05-311-71/+154
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-101-1/+14
|\ \ | |/
| * vf_overlay: implement poll_frame()Anton Khirnov2012-04-091-1/+14
OpenPOWER on IntegriCloud