Roll FFMpeg for M26. Fix ffmpeg float audio decoding.

media/webm/webm_stream_parser.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/webm/webm_stream_parser.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 334 matching lines @@
     return -1;
   }
 
   bool is_audio_encrypted = !tracks_parser.audio_encryption_key_id().empty();
   AudioDecoderConfig audio_config;
   if (is_audio_encrypted) {
     const AudioDecoderConfig& original_audio_config =
         config_helper.audio_config();
 
     audio_config.Initialize(original_audio_config.codec(),
-                            original_audio_config.bits_per_channel(),
+                            original_audio_config.sample_format(),
                             original_audio_config.channel_layout(),
                             original_audio_config.samples_per_second(),
                             original_audio_config.extra_data(),
                             original_audio_config.extra_data_size(),
-                            is_audio_encrypted, false);
+                            is_audio_encrypted,
+                            false);
 
     FireNeedKey(tracks_parser.audio_encryption_key_id());
   } else {
     audio_config.CopyFrom(config_helper.audio_config());
   }
 
   // TODO(xhwang): Support decryption of audio (see http://crbug.com/123421).
   bool is_video_encrypted = !tracks_parser.video_encryption_key_id().empty();
 
   VideoDecoderConfig video_config;
@@ skipping 95 matching lines @@
 
 void WebMStreamParser::FireNeedKey(const std::string& key_id) {
   int key_id_size = key_id.size();
   DCHECK_GT(key_id_size, 0);
   scoped_array<uint8> key_id_array(new uint8[key_id_size]);
   memcpy(key_id_array.get(), key_id.data(), key_id_size);
   need_key_cb_.Run(kWebMInitDataType, key_id_array.Pass(), key_id_size);
 }
 
 }  // namespace media