summaryrefslogtreecommitdiff
path: root/ffmpeg.h
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-091-0/+391