From 78e5a331074a456097a162d47501daf1df1ab1a3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 25 Jul 2013 22:04:20 +0100 Subject: Hopefully much cleaner handling of PTS changes under resample. --- src/lib/ffmpeg_decoder.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/lib/ffmpeg_decoder.cc') diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index e2e5b9d64..58745598a 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -60,7 +60,7 @@ using libdcp::Size; FFmpegDecoder::FFmpegDecoder (shared_ptr f, shared_ptr c, bool video, bool audio) : Decoder (f) , VideoDecoder (f, c) - , AudioDecoder (f, c) + , AudioDecoder (f) , SubtitleDecoder (f) , FFmpeg (c) , _subtitle_codec_context (0) @@ -140,8 +140,6 @@ FFmpegDecoder::flush () decode_audio_packet (); } - AudioDecoder::flush (); - /* Stop us being asked for any more data */ _video_position = _ffmpeg_content->video_length (); _audio_position = _ffmpeg_content->audio_length (); -- cgit v1.2.3