Use ffmpeg_features buildflags

media/filters/ffmpeg_audio_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/ffmpeg_audio_decoder.h"
 
 #include <stdint.h>
 
 #include "base/callback_helpers.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 16 matching lines @@
                                  const scoped_refptr<DecoderBuffer>& input) {
   // Three conditions to meet to declare end of stream for this decoder:
   // 1. FFmpeg didn't read anything.
   // 2. FFmpeg didn't output anything.
   // 3. An end of stream buffer is received.
   return result == 0 && decoded_size == 0 && input->end_of_stream();
 }
 
 // Return the number of channels from the data in |frame|.
 static inline int DetermineChannels(AVFrame* frame) {
-#if defined(CHROMIUM_NO_AVFRAME_CHANNELS)
-  // When use_system_ffmpeg==1, libav's AVFrame doesn't have channels field.
-  return av_get_channel_layout_nb_channels(frame->channel_layout);
-#else
   return frame->channels;
-#endif
 }
 
 // Called by FFmpeg's allocation routine to allocate a buffer. Uses
 // AVCodecContext.opaque to get the object reference in order to call
 // GetAudioBuffer() to do the actual allocation.
 static int GetAudioBufferImpl(struct AVCodecContext* s,
                               AVFrame* frame,
                               int flags) {
   FFmpegAudioDecoder* decoder = static_cast<FFmpegAudioDecoder*>(s->opaque);
   return decoder->GetAudioBuffer(s, frame, flags);
@@ skipping 403 matching lines @@
   // Now create an AVBufferRef for the data just allocated. It will own the
   // reference to the AudioBuffer object.
   AudioBuffer* opaque = buffer.get();
   opaque->AddRef();
   frame->buf[0] = av_buffer_create(frame->data[0], buffer_size_in_bytes,
                                    ReleaseAudioBufferImpl, opaque, 0);
   return 0;
 }
 
 }  // namespace media