summaryrefslogtreecommitdiff
path: root/ffmpeg_filter.c
Commit message (Expand)AuthorAge
* Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'Michael Niedermayer2012-08-20
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-09