summaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_alphamerge.c
Commit message (Expand)AuthorAgeFilesLines
* 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
OpenPOWER on IntegriCloud