diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-09-09 22:00:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-09-09 22:00:09 +0100 |
| commit | 43494601da412259814fdb1345950329cc4aa849 (patch) | |
| tree | 4c7d5fb8038998753862bab0b7192109786996de /src/lib/audio_decoder_stream.cc | |
| parent | 70aaee5bb3fd57ae749357b72f7afb655fd643e6 (diff) | |
| parent | cb3d1d6eda4c798263e86c60c571fbfbeb025acd (diff) | |
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
Diffstat (limited to 'src/lib/audio_decoder_stream.cc')
| -rw-r--r-- | src/lib/audio_decoder_stream.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/audio_decoder_stream.cc b/src/lib/audio_decoder_stream.cc index 267c542cd..97db8a93f 100644 --- a/src/lib/audio_decoder_stream.cc +++ b/src/lib/audio_decoder_stream.cc @@ -45,7 +45,7 @@ AudioDecoderStream::AudioDecoderStream (shared_ptr<const AudioContent> content, , _decoder (decoder) { if (content->resampled_audio_frame_rate() != _stream->frame_rate() && _stream->channels() > 0) { - _resampler.reset (new Resampler (_stream->frame_rate(), content->resampled_audio_frame_rate(), _stream->channels ())); + _resampler.reset (new Resampler (_stream->frame_rate(), content->resampled_audio_frame_rate(), _stream->channels (), decoder->fast ())); } reset_decoded (); |