diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-11-11 14:19:32 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-11-11 14:19:32 +0000 |
| commit | 13b935067e892875ea9e76c3d63fcc11d2c429b0 (patch) | |
| tree | efacaaef75e72873b2975026cd2133163ca22d99 /src/lib/ffmpeg_decoder.cc | |
| parent | e9e674ff760eab129f05e0e0651a8f12902409db (diff) | |
Rename use_source_audio to use_content_audio.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 1cac25ca1..78d0c48c4 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -226,7 +226,7 @@ FFmpegDecoder::pass () process_video (_frame); } - if (_audio_stream && _opt->decode_audio && _film->use_source_audio()) { + if (_audio_stream && _opt->decode_audio && _film->use_content_audio()) { while (avcodec_decode_audio4 (_audio_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) { int const data_size = av_samples_get_buffer_size ( 0, _audio_codec_context->channels, _frame->nb_samples, audio_sample_format (), 1 @@ -290,7 +290,7 @@ FFmpegDecoder::pass () } } - } else if (_audio_stream && _packet.stream_index == _audio_stream.get().id() && _opt->decode_audio && _film->use_source_audio()) { + } else if (_audio_stream && _packet.stream_index == _audio_stream.get().id() && _opt->decode_audio && _film->use_content_audio()) { int frame_finished; if (avcodec_decode_audio4 (_audio_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) { |