Roll FFMpeg for M26. Fix ffmpeg float audio decoding.

media/filters/ffmpeg_audio_decoder.h

 // 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.
 
 #ifndef MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 
 #include <list>
 
 #include "base/callback.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/demuxer_stream.h"
 
 struct AVCodecContext;
 struct AVFrame;
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace media {
 
+class AudioBus;
 class AudioTimestampHelper;
 class DataBuffer;
 class DecoderBuffer;
 struct QueuedAudioBuffer;
 
 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
  public:
   explicit FFmpegAudioDecoder(
       const scoped_refptr<base::MessageLoopProxy>& message_loop);
 
@@ skipping 51 matching lines @@
 
   // Holds decoded audio.
   AVFrame* av_frame_;
 
   ReadCB read_cb_;
 
   // Since multiple frames may be decoded from the same packet we need to queue
   // them up and hand them out as we receive Read() calls.
   std::list<QueuedAudioBuffer> queued_audio_;
 
+  // We may need to convert the audio data coming out of FFmpeg from planar
+  // float to integer.
+  scoped_ptr<AudioBus> converter_bus_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_