summaryrefslogtreecommitdiff
path: root/libavfilter/vf_alphamerge.c
Commit message (Expand)AuthorAge
* lavfi/vf_alphamerge: reindent after last commit.Nicolas George2015-10-07
* lavfi/vf_alphamerge: remove looping on request_frame().Nicolas George2015-10-07
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-29
* avfilter: remove redundant .get_(audio/video)_buffer initializationsPaul B Mahol2013-09-07
* lavfi/alphamerge: raise filter_frame() error.Clément Bœsch2013-03-13
* lavfi: remove remaining forgotten min/rej perms.Clément Bœsch2013-03-10
* Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-10
* lavfi: declare arrays that never change as static constPaul B Mahol2012-12-21
* lavfi/alphamerge: fix leak introduced in 217163ebStefano Sabatini2012-12-02
* lavfi/alphamerge: switch to ff_filter_frame() APIStefano Sabatini2012-12-02
* lavfi: convert remaining input/output list compound literals to named objects.Clément Bœsch2012-11-28
* Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-08
* vf_alphamerge: fix permissions.Nicolas George2012-08-17
* vf_alphamerge: Fix reversed conditionalSteven Robertson2012-07-27
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-22
* lavfi: add alphaextract and alphamerge filtersSteven Robertson2012-07-22