From d6e74fb7dbc5b01c9ce42f8fe780bb16262d13b1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 17 Oct 2012 22:40:08 +0100 Subject: Re-work FilmState / Film relationship a bit; Film now inherits from FilmState and FilmState does get/set. --- src/lib/ffmpeg_decoder.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/ffmpeg_decoder.cc') 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); } -- cgit v1.2.3