OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d9e663 31bb172)
Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 04:07:15 +0000 (05:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 04:07:19 +0000 (05:07 +0100)
* cus/stable:
  ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration
  ffmpeg: free empty subtitles as well in transcode_subtitles
  ffmpeg: do not pass possibly undefined subtitles to sub2video_update

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help