summaryrefslogtreecommitdiff
path: root/libavfilter/vf_alphamerge.c
Commit message (Expand)AuthorAge
* 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