From e80e1b8ae09d87917910af7402945e0d0a31666c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 28 Jul 2013 16:42:46 +0100 Subject: Don't decode subtitles if they are not enabled. --- src/lib/ffmpeg_decoder.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/lib/ffmpeg_decoder.cc') 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 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 (); } -- cgit v1.2.3