summaryrefslogtreecommitdiff
path: root/ffmpeg.h
Commit message (Expand)AuthorAge
* Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'Michael Niedermayer2012-10-10
* Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-08
* ffmpeg: add option to control copying of frames prior to start.Michael Niedermayer2012-09-27
* ffmpeg: use PTS from the AVSubtitle structure.Nicolas George2012-09-15
* Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'Michael Niedermayer2012-08-31
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-18
* ffmpeg: add an option to fix subtitles durations.Nicolas George2012-08-14
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-09
* Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'Michael Niedermayer2012-08-09
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-09