Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(432)

Unified Diff: media/webm/webm_stream_parser.cc

Issue 11280301: Roll FFMpeg for M26. Fix ffmpeg float audio decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix DCHECK. Roll DEPS for fix. Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« media/filters/ffmpeg_audio_decoder.cc ('K') | « media/mp4/mp4_stream_parser.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/webm/webm_stream_parser.cc
diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc
index dfa56c3df0cf9a5666338fb3824decb56cc62a82..ae65420d90ee2e9c0f52bfcc5fc3e8da614dee90 100644
--- a/media/webm/webm_stream_parser.cc
+++ b/media/webm/webm_stream_parser.cc
@@ -352,12 +352,13 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
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 {
« media/filters/ffmpeg_audio_decoder.cc ('K') | « media/mp4/mp4_stream_parser.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698