diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-24 00:57:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-24 00:57:46 +0100 |
| commit | 6d1748f37097e6f61ee1c6fb66c4352b0834ec8c (patch) | |
| tree | eadd9dc24388fff2e54a0cab07afd9a9ed27602e /src/lib/ffmpeg_decoder.cc | |
| parent | 2783bac450101e809c485ef249ce55a9c6d7996e (diff) | |
Try to fix up subtitle timing a bit.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index e2aa8add0..e954294ec 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -304,7 +304,7 @@ FFmpegDecoder::do_pass () process_audio (_frame->data[0], data_size); } - } else if (_subtitle_stream >= 0 && _packet.stream_index == _subtitle_stream && _opt->decode_subtitles) { + } else if (_subtitle_stream >= 0 && _packet.stream_index == _subtitle_stream && _opt->decode_subtitles && _first_video) { int got_subtitle; AVSubtitle sub; @@ -313,7 +313,7 @@ FFmpegDecoder::do_pass () no AVSubtitleRects. */ if (sub.num_rects > 0) { - process_subtitle (shared_ptr<TimedSubtitle> (new TimedSubtitle (sub))); + process_subtitle (shared_ptr<TimedSubtitle> (new TimedSubtitle (sub, _first_video.get()))); } avsubtitle_free (&sub); } |