diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-16 17:19:30 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-16 17:19:30 +0100 |
| commit | bd709c1e98e7653dafe7dff302440a7890140c7d (patch) | |
| tree | 5ed050d67e30195e665f5475322d27d7790c2b23 /src/lib/audio_decoder_stream.cc | |
| parent | f0da433894308ed72b0dbdd116a30a8d659c33cc (diff) | |
| parent | f09e6545efa4c5ca816e89e28a287bc6ab1ee50b (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src/lib/audio_decoder_stream.cc')
| -rw-r--r-- | src/lib/audio_decoder_stream.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/audio_decoder_stream.cc b/src/lib/audio_decoder_stream.cc index 274bf2d54..4d1a5e4c5 100644 --- a/src/lib/audio_decoder_stream.cc +++ b/src/lib/audio_decoder_stream.cc @@ -87,7 +87,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate) /* Keep stuffing data into _decoded until we have enough data, or the subclass does not want to give us any more */ while ( (_decoded.frame > frame || (_decoded.frame + _decoded.audio->frames()) < end) && - !_decoder->pass () + !_decoder->pass (Decoder::PASS_REASON_AUDIO) ) {} @@ -95,7 +95,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate) } else { while ( _decoded.audio->frames() < length && - !_decoder->pass () + !_decoder->pass (Decoder::PASS_REASON_AUDIO) ) {} |