summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-10-23 16:12:14 +0100
committerCarl Hetherington <cth@carlh.net>2015-10-23 16:12:14 +0100
commit526fd6de4c80a7ac9614a1cb0209efff7b171cd5 (patch)
treea6da82bdd59d98f19661ab1da2415cbc37353b0f /src/lib/ffmpeg_decoder.cc
parentf24452ee5fe7af655a16d4e1a3bb1c87a54596cc (diff)
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.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
-rw-r--r--src/lib/ffmpeg_decoder.cc6
1 files changed, 3 insertions, 3 deletions
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<const FFmpegContent> 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 ();
}