Linux: make it possible to compile against libav when use_system_ffmpeg==1

media/filters/audio_file_reader.cc

Index: media/filters/audio_file_reader.cc
diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc
index 32627b04b10ad558bab4b4facc386da0a3c4552d..fc39bfc1b2f38b1b77620f6e027e828c4f667eb7 100644
--- a/media/filters/audio_file_reader.cc
+++ b/media/filters/audio_file_reader.cc
@@ -180,12 +180,22 @@ int AudioFileReader::Read(AudioBus* audio_bus) {
       }
 
       if (av_frame->sample_rate != sample_rate_ ||
+#ifdef CHROMIUM_NO_AVFRAME_CHANNELS

[DaleCurtis, 2013/04/17 22:14:23]

Instead of doing this, just do one #ifdef above the block and set frame_channels
as I mentioned in my initial comment. Then you don't have a double #if section.

[Paweł Hajdan Jr., 2013/04/18 17:27:10]

Done.

+          av_get_channel_layout_nb_channels(
+              av_frame->channel_layout) != channels_ ||
+#else
           av_frame->channels != channels_ ||
+#endif
           av_frame->format != av_sample_format_) {
         DLOG(ERROR) << "Unsupported midstream configuration change!"
                     << " Sample Rate: " << av_frame->sample_rate << " vs "
                     << sample_rate_
+#ifdef CHROMIUM_NO_AVFRAME_CHANNELS
+                    << ", Channels: " << av_get_channel_layout_nb_channels(
+                                             av_frame->channel_layout) << " vs "
+#else
                     << ", Channels: " << av_frame->channels << " vs "
+#endif
                     << channels_
                     << ", Sample Format: " << av_frame->format << " vs "
                     << av_sample_format_;