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

media/filters/ffmpeg_audio_decoder.cc

Index: media/filters/ffmpeg_audio_decoder.cc
diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc
index 6df6112e7526dfbefa18044b643484fe8a51862e..83716ad402c9ea51b4b976ebfd5104b8b60e9b85 100644
--- a/media/filters/ffmpeg_audio_decoder.cc
+++ b/media/filters/ffmpeg_audio_decoder.cc
@@ -398,12 +398,22 @@ void FFmpegAudioDecoder::RunDecodeLoop(
     int decoded_audio_size = 0;
     if (frame_decoded) {
       if (av_frame_->sample_rate != samples_per_second_ ||
+#ifdef CHROMIUM_NO_AVFRAME_CHANNELS

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

Ditto.

[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 "
                     << samples_per_second_
+#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_;