projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused Player::_ignore_audio. Ignore position
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_decoder.cc
diff --git
a/src/lib/ffmpeg_decoder.cc
b/src/lib/ffmpeg_decoder.cc
index a54ac96addbd7dd158ea6d13f02d784065fd2e2c..a09eab68e12e11763436cd83db1378d710a632cc 100644
(file)
--- 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 ();
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 ();
decode_subtitle_packet ();
} else {
decode_audio_packet ();