diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-09 15:56:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-09 15:56:55 +0100 |
| commit | b5828ccf20a0e0c4365854ac19a05d5a4783e254 (patch) | |
| tree | 338fd3dfc1b7f74edf4fb2615ed6d1136942f4d8 /src/lib/ffmpeg_decoder.cc | |
| parent | 9b0d04f34424c9aeddaf07007838f2c8c0113093 (diff) | |
Make subtitle addition optional.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 808e5ac9b..7bc579ba6 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -249,7 +249,7 @@ FFmpegDecoder::do_pass () process_audio (_frame->data[0], data_size); } - } else if (_subtitle_stream >= 0 && _packet.stream_index == _subtitle_stream) { + } else if (_subtitle_stream >= 0 && _packet.stream_index == _subtitle_stream && _fs->with_subtitles) { if (_have_subtitle) { avsubtitle_free (&_subtitle); @@ -453,3 +453,8 @@ FFmpegDecoder::overlay (shared_ptr<Image> image) const } } +bool +FFmpegDecoder::has_subtitles () const +{ + return (_subtitle_stream != -1); +} |