Roll FFMpeg for M26. Fix ffmpeg float audio decoding.

media/filters/decrypting_demuxer_stream.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/decrypting_demuxer_stream.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 141 matching lines @@
 
   request_decryptor_notification_cb_.Reset();
   decryptor_ = decryptor;
 
   switch (stream_type_) {
     case AUDIO: {
       const AudioDecoderConfig& input_audio_config =
           demuxer_stream_->audio_decoder_config();
       audio_config_.reset(new AudioDecoderConfig());
       audio_config_->Initialize(input_audio_config.codec(),
-                                input_audio_config.bits_per_channel(),
+                                input_audio_config.sample_format(),
                                 input_audio_config.channel_layout(),
                                 input_audio_config.samples_per_second(),
                                 input_audio_config.extra_data(),
                                 input_audio_config.extra_data_size(),
                                 false,  // Output audio is not encrypted.
                                 false);
       break;
     }
 
     case VIDEO: {
@@ skipping 169 matching lines @@
   state_ = kIdle;
   base::ResetAndReturn(&reset_cb_).Run();
 }
 
 Decryptor::StreamType DecryptingDemuxerStream::GetDecryptorStreamType() const {
   DCHECK(stream_type_ == AUDIO || stream_type_ == VIDEO);
   return stream_type_ == AUDIO ? Decryptor::kAudio : Decryptor::kVideo;
 }
 
 }  // namespace media