From 0412f1a2b29f380cb4ca35787fc7174d6948072c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 25 Feb 2014 10:46:15 +0000 Subject: Fix a couple of audio crashes in the film viewer. Fix serialisation of SubRipContent. --- src/lib/ffmpeg_decoder.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/lib/ffmpeg_decoder.cc') diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index b7006a264..4534de589 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -136,9 +136,8 @@ FFmpegDecoder::flush () if (_ffmpeg_content->audio_stream() && _decode_audio) { decode_audio_packet (); + AudioDecoder::flush (); } - - AudioDecoder::flush (); } bool @@ -391,7 +390,9 @@ void FFmpegDecoder::seek (ContentTime time, bool accurate) { Decoder::seek (time, accurate); - AudioDecoder::seek (time, accurate); + if (_decode_audio) { + AudioDecoder::seek (time, accurate); + } /* If we are doing an accurate seek, our initial shot will be 200ms (200 being a number plucked from the air) earlier than we want to end up. The loop below -- cgit v1.2.3