aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_alphamerge.c
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-291-1/+1
* avfilter: remove redundant .get_(audio/video)_buffer initializationsPaul B Mahol2013-09-071-1/+0
* lavfi/alphamerge: raise filter_frame() error.Clément Bœsch2013-03-131-4/+5
* lavfi: remove remaining forgotten min/rej perms.Clément Bœsch2013-03-101-2/+1
* Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer2013-03-101-8/+8
* lavfi: declare arrays that never change as static constPaul B Mahol2012-12-211-2/+2
* lavfi/alphamerge: fix leak introduced in 217163ebStefano Sabatini2012-12-021-1/+1
* lavfi/alphamerge: switch to ff_filter_frame() APIStefano Sabatini2012-12-021-16/+5
* lavfi: convert remaining input/output list compound literals to named objects.Clément Bœsch2012-11-281-25/+33
* Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-081-5/+5
* vf_alphamerge: fix permissions.Nicolas George2012-08-171-4/+2
* vf_alphamerge: Fix reversed conditionalSteven Robertson2012-07-271-1/+1
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-221-3/+4
* lavfi: add alphaextract and alphamerge filtersSteven Robertson2012-07-221-0/+212