aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.h
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'Michael Niedermayer2012-10-131-2/+2
* Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'Michael Niedermayer2012-10-101-2/+0
* Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-081-1/+1
* ffmpeg: add option to control copying of frames prior to start.Michael Niedermayer2012-09-271-0/+3
* ffmpeg: use PTS from the AVSubtitle structure.Nicolas George2012-09-151-1/+0
* Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'Michael Niedermayer2012-08-311-1/+5
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-181-1/+3
* ffmpeg: add an option to fix subtitles durations.Nicolas George2012-08-141-0/+10
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-091-1/+1
* Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'Michael Niedermayer2012-08-091-1/+1
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-091-0/+391