diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 05:07:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 05:07:19 +0100 |
| commit | bd9de4f5942a9e073f37df7a64ed1baff2d24419 (patch) | |
| tree | b32c1915330b2977758cc06909618ff75572ac45 /libavfilter | |
| parent | 5d9e663064416a661e5af5040a33b70a309632db (diff) | |
| parent | 31bb172be26aa7531a0917994d79ea5dc3709a0b (diff) | |
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>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions