summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-07-11 14:46:52 +0100
committerCarl Hetherington <cth@carlh.net>2017-07-11 14:46:52 +0100
commit081f974c2c75c306d07d5a6f5da6847826a05a9c (patch)
treef3c77f02b24b0d835efc6a61a8fe86bc3dd6a970 /src/lib/ffmpeg_decoder.cc
parentb242f871b4da75572bb0d5bf111ae6103bf669b7 (diff)
Remove unused Player::_ignore_audio. Ignore position
of things that we are ignoring; this fixes strange behaviour (delays) when analysing audio as it used to keep pass()ing decoders to get data that would never come.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
-rw-r--r--src/lib/ffmpeg_decoder.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index a54ac96ad..a09eab68e 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -175,7 +175,7 @@ FFmpegDecoder::pass ()
if (_video_stream && si == _video_stream.get() && !video->ignore()) {
decode_video_packet ();
- } else if (fc->subtitle_stream() && fc->subtitle_stream()->uses_index (_format_context, si)) {
+ } else if (fc->subtitle_stream() && fc->subtitle_stream()->uses_index(_format_context, si) && !subtitle->ignore()) {
decode_subtitle_packet ();
} else {
decode_audio_packet ();