[patch] lu_zero-464676.patch

lu_zero-464676.patch (text/plain), 1.06 KB, created by Mike Gilbert on 2013-04-11 19:36:48 UTC

diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc
index 32627b0..59e5093 100644
--- a/media/filters/audio_file_reader.cc
+++ b/media/filters/audio_file_reader.cc
@@ -178,14 +178,15 @@ int AudioFileReader::Read(AudioBus* audio_bus) {
         continue_decoding = false;
         break;
       }
+      int frame_channels = av_get_channel_layout_nb_channels(av_frame->channel_layout);
 
       if (av_frame->sample_rate != sample_rate_ ||
-          av_frame->channels != channels_ ||
+          frame_channels != channels_ ||
           av_frame->format != av_sample_format_) {
         DLOG(ERROR) << "Unsupported midstream configuration change!"
                     << " Sample Rate: " << av_frame->sample_rate << " vs "
                     << sample_rate_
-                    << ", Channels: " << av_frame->channels << " vs "
+                    << ", Channels: " << frame_channels << " vs "
                     << channels_
                     << ", Sample Format: " << av_frame->format << " vs "
                     << av_sample_format_;