Roll FFMpeg for M26. Fix ffmpeg float audio decoding.

media/filters/ffmpeg_audio_decoder.h

Index: media/filters/ffmpeg_audio_decoder.h
diff --git a/media/filters/ffmpeg_audio_decoder.h b/media/filters/ffmpeg_audio_decoder.h
index ce096ee996479d4ac45db0654199f6f6947a05bd..ebaa56364114871062ad536a0d07175c8d6609ee 100644
--- a/media/filters/ffmpeg_audio_decoder.h
+++ b/media/filters/ffmpeg_audio_decoder.h
@@ -20,6 +20,7 @@ class MessageLoopProxy;
 
 namespace media {
 
+class AudioBus;
 class AudioTimestampHelper;
 class DataBuffer;
 class DecoderBuffer;
@@ -91,6 +92,10 @@ class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
   // 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);
 };