summaryrefslogtreecommitdiff
path: root/ffmpeg.h
Commit message (Expand)AuthorAge
* Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'Michael Niedermayer2012-08-09
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-09