summaryrefslogtreecommitdiff
path: root/src/lib/video_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/video_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/video_decoder.cc')
-rw-r--r--src/lib/video_decoder.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index efc0ecf11..1c9a6374f 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -98,7 +98,7 @@ VideoDecoder::get_video (Frame frame, bool accurate)
break;
}
- if (pass (PASS_REASON_VIDEO)) {
+ if (pass ()) {
/* The decoder has nothing more for us */
break;
}
@@ -115,7 +115,7 @@ VideoDecoder::get_video (Frame frame, bool accurate)
dec = decoded_video (frame);
} else {
/* Any frame will do: use the first one that comes out of pass() */
- while (_decoded_video.empty() && !pass (PASS_REASON_VIDEO)) {}
+ while (_decoded_video.empty() && !pass ()) {}
if (!_decoded_video.empty ()) {
dec.push_back (_decoded_video.front ());
}