summaryrefslogtreecommitdiff
path: root/libavfilter/vf_overlay.c
Commit message (Expand)AuthorAge
* Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer2012-10-11
|\
| * lavfi: convert input/ouput list compound literals to named objectsMans Rullgard2012-10-10
* | Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-08
|\|
| * Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov2012-10-08
| * vf_overlay: properly sync inputs.Anton Khirnov2012-10-04
* | Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b'Michael Niedermayer2012-10-04
|\|
| * vf_overlay: get rid of pointless messing with timebase.Anton Khirnov2012-10-04
* | Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-05
|\|
* | lavfi/overlay: fix return values.Nicolas George2012-08-22
* | lavfi: add priv class to filter definitions and flags to filter internal optionsStefano Sabatini2012-08-18
* | vf_overlay: fix permissions.Nicolas George2012-08-17
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-16
|\|
| * Don't include common.h from avutil.hMartin Storsjö2012-08-15
| * vf_overlay: ensure the overlay frame does not get leaked.Anton Khirnov2012-07-26
| * vf_overlay: prevent premature freeing of cur_bufMichael Niedermayer2012-07-26
* | lavfi/overlay: remove dead initialization.Clément Bœsch2012-08-06
* | vf_overlay: fix missed returnMichael Niedermayer2012-07-23
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-22
|\|
| * lavfi: check all avfilter_ref_buffer() calls for errors.Anton Khirnov2012-07-22
| * lavfi: use avfilter_unref_bufferp() where appropriate.Anton Khirnov2012-07-22
| * lavfi: add error handling to end_frame().Anton Khirnov2012-07-22
| * lavfi: add error handling to draw_slice().Anton Khirnov2012-07-22
| * lavfi: add error handling to start_frame().Anton Khirnov2012-07-22
* | Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'Michael Niedermayer2012-07-22
|\|
| * lavfi: use const for AVFilterPad declarations in all filters.Ronald S. Bultje2012-07-21
* | overlay: clear cur_buf on main input link.Nicolas George2012-07-22
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-21
|\|
| * lavfi: unref AVFilterLink.cur_buf in ff_end_frame().Anton Khirnov2012-07-20
| * vf_overlay: don't access a buffer reference that's been given away.Anton Khirnov2012-07-20
* | vf_overlay: prevent premature freeing of cur_bufMichael Niedermayer2012-07-21
* | vf_overlay: use unref_bufferP()Michael Niedermayer2012-07-21
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-27
|\|
| * lavfi: make filters less verbose.Anton Khirnov2012-06-26
* | Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'Michael Niedermayer2012-06-26
|\|
| * lavfi: remove 'opaque' parameter from AVFilter.init()Anton Khirnov2012-06-26
* | lavfi: define macro AVFILTER_DEFINE_CLASSStefano Sabatini2012-06-22
* | lavfi: use designated initializers for AVClassPaul B Mahol2012-06-17
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-13
|\|
| * lavfi: make avfilter_get_video_buffer() private on next bump.Anton Khirnov2012-06-13
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-06
|\|
| * lavfi: remove request/poll and drawing functions from public API on next bumpAnton Khirnov2012-06-05
| * lavfi: make formats API private on next bump.Anton Khirnov2012-06-05
* | lavfi: use av_default_item_name() as filter private context loggerStefano Sabatini2012-06-04
* | lavfi: add avfilter_default_filter_name()Stefano Sabatini2012-06-04
* | vf_overlay: rewrite request/push logic.Nicolas George2012-05-31
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-10
|\|
| * vf_overlay: implement poll_frame()Anton Khirnov2012-04-09
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-22
|\|
| * Mark mutable static data const where appropriate.Alex Converse2012-02-21
* | lavfi/overlay: add logic for avoiding overlaying frames with PTS > main frame...Stefano Sabatini2012-02-17