diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-28 16:42:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-28 16:42:46 +0100 |
| commit | e80e1b8ae09d87917910af7402945e0d0a31666c (patch) | |
| tree | e82dde0ed7fbff9eb1181cd0f74b0fb4515984ed /src/lib/ffmpeg_decoder.cc | |
| parent | 95e289ac980fb0775b17e40e377c5f6e09908a1f (diff) | |
Don't decode subtitles if they are not enabled.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index ddc9e71a0..ceb14bacc 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -166,11 +166,14 @@ FFmpegDecoder::pass () avcodec_get_frame_defaults (_frame); + shared_ptr<const Film> film = _film.lock (); + assert (film); + if (_packet.stream_index == _video_stream && _decode_video) { decode_video_packet (); } else if (_ffmpeg_content->audio_stream() && _packet.stream_index == _ffmpeg_content->audio_stream()->id && _decode_audio) { decode_audio_packet (); - } else if (_ffmpeg_content->subtitle_stream() && _packet.stream_index == _ffmpeg_content->subtitle_stream()->id) { + } else if (_ffmpeg_content->subtitle_stream() && _packet.stream_index == _ffmpeg_content->subtitle_stream()->id && film->with_subtitles ()) { decode_subtitle_packet (); } |