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)
commitbd9de4f5942a9e073f37df7a64ed1baff2d24419
treeb32c1915330b2977758cc06909618ff75572ac45
parent5d9e663064416a661e5af5040a33b70a309632db
parent31bb172be26aa7531a0917994d79ea5dc3709a0b
Merge remote-tracking branch 'cus/stable'

* 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>