diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-17 22:40:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-17 22:40:08 +0100 |
| commit | d6e74fb7dbc5b01c9ce42f8fe780bb16262d13b1 (patch) | |
| tree | 85ec43c83ad755843e6009f29a01edbe4985b5c0 /src/lib/ffmpeg_decoder.cc | |
| parent | 988fa33f7d25f2f3319442ce3c9ed661172e4d56 (diff) | |
Re-work FilmState / Film relationship a bit; Film now inherits from FilmState and FilmState does get/set.
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 4cec7ef35..828934604 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -220,7 +220,7 @@ FFmpegDecoder::do_pass () 0, _audio_codec_context->channels, _frame->nb_samples, audio_sample_format (), 1 ); - assert (_audio_codec_context->channels == _fs->audio_channels); + assert (_audio_codec_context->channels == _fs->audio_channels()); process_audio (_frame->data[0], data_size); } } @@ -245,7 +245,7 @@ FFmpegDecoder::do_pass () 0, _audio_codec_context->channels, _frame->nb_samples, audio_sample_format (), 1 ); - assert (_audio_codec_context->channels == _fs->audio_channels); + assert (_audio_codec_context->channels == _fs->audio_channels()); process_audio (_frame->data[0], data_size); } |