From 526fd6de4c80a7ac9614a1cb0209efff7b171cd5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 23 Oct 2015 16:12:14 +0100 Subject: Revert "Avoid decoding other packets when looking for subs." This reverts commit 9e025d3f85f9d6d855b3d5e6c90bca0eac3a3d49. It causes corruption in prophet_clip.xml for reasons that are not yet known. --- src/lib/ffmpeg_decoder.cc | 6 +++--- 1 file changed, 3 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 ee9d9eecb..72a3d02b4 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -89,7 +89,7 @@ FFmpegDecoder::flush () } bool -FFmpegDecoder::pass (PassReason reason) +FFmpegDecoder::pass () { int r = av_read_frame (_format_context, &_packet); @@ -112,11 +112,11 @@ FFmpegDecoder::pass (PassReason reason) int const si = _packet.stream_index; shared_ptr fc = _ffmpeg_content; - if (si == _video_stream && !_ignore_video && reason != PASS_REASON_SUBTITLE) { + if (si == _video_stream && !_ignore_video) { decode_video_packet (); } else if (fc->subtitle_stream() && fc->subtitle_stream()->uses_index (_format_context, si)) { decode_subtitle_packet (); - } else if (reason != PASS_REASON_SUBTITLE) { + } else { decode_audio_packet (); } -- cgit v1.2.3