summaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_overlay.c
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'de203abd71baae7f120313259b45cf935c85203e'Michael Niedermayer2014-02-041-2/+31
|\
| * vf_overlay: add eof_action switchKeith Lawson2014-02-041-5/+27
* | lavfi/overlay: add yuv422 format modeStefano Sabatini2014-02-021-1/+13
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-291-1/+1
|\ \ | |/
| * lavfi: do not export the filters from shared objectsAnton Khirnov2013-10-281-1/+1
* | lavfi/overlay: correct small error in intersection detectionBenedict Endemann2013-10-271-2/+2
* | avfilter/dualinput: simplifyPaul B Mahol2013-09-301-10/+4
* | lavfi/dualinput: reimplement on top of framesync.Nicolas George2013-09-231-0/+5
* | avfilter: remove duplicate includesMichael Niedermayer2013-09-211-1/+0
* | avfilter: various cosmeticsPaul B Mahol2013-09-121-13/+9
* | avfilter: remove redundant .get_(audio/video)_buffer initializationsPaul B Mahol2013-09-071-1/+0
* | lavfi/overlay: remove do_blend forward declaration.Clément Bœsch2013-05-271-16/+13
* | lavfi: add dual input helpers.Clément Bœsch2013-05-271-134/+21
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-161-104/+104
|\ \ | |/
| * vf_overlay: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-161-21/+21
* | lavfi: replace passthrough_filter_frame with a flag.Clément Bœsch2013-05-121-21/+4
* | lavfi/overlay: simpler up-rounded w/h computations.Clément Bœsch2013-05-091-4/+4
* | lavfi/overlay: reindent fix.Clément Bœsch2013-05-071-6/+5
* | lavfi/overlay: support timeline through the new system.Clément Bœsch2013-04-231-31/+33
* | lavfi: add frame counter into AVFilterLink and use it in filters.Clément Bœsch2013-04-231-1/+1
* | lavfi: remove now unused args parameter from AVFilter.init and init_opaqueMichael Niedermayer2013-04-121-1/+1
* | lavfi/overlay: improve feedback in case of invalid expressionStefano Sabatini2013-04-121-8/+9
* | lavfi/overlay: fix crash in case of invalid expressionStefano Sabatini2013-04-121-4/+9
* | lavfi/overlay: add repeatlast optionStefano Sabatini2013-04-121-0/+6
* | lavfi/overlay: reindent constants in option listStefano Sabatini2013-04-121-9/+5
* | lavfi/overlay: cleanup unused shorthand.Clément Bœsch2013-04-111-3/+0
* | lavfi/overlay: remove dupe initializerPaul B Mahol2013-04-101-1/+0
* | Merge commit '9087eaf193b8ce99c41352064a81916fa66adb49'Michael Niedermayer2013-04-101-26/+29
|\ \ | |/
| * vf_overlay: switch to an AVOptions-based system.Anton Khirnov2013-04-091-15/+21
* | lavfi/overlay: add process_command callbackStefano Sabatini2013-04-101-39/+75
* | lavfi/overlay: add enable expressionStefano Sabatini2013-04-101-7/+18
* | lavfi/overlay: add dynamic expression evaluation supportStefano Sabatini2013-04-101-33/+87
* | 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
OpenPOWER on IntegriCloud