media/filters/decrypting_demuxer_stream.cc - Issue 11280301: Roll FFMpeg for M26. Fix ffmpeg float audio decoding.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/decrypting_demuxer_stream.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:

Index: media/filters/decrypting_demuxer_stream.cc

diff --git a/media/filters/decrypting_demuxer_stream.cc b/media/filters/decrypting_demuxer_stream.cc

index 454f8a75c4d44b8ed1eae94633c94ae6d8a10017..712f7ca36f24405440fddce039ffea823c3d4490 100644

--- a/media/filters/decrypting_demuxer_stream.cc

+++ b/media/filters/decrypting_demuxer_stream.cc

@@ -159,7 +159,7 @@ void DecryptingDemuxerStream::SetDecryptor(Decryptor* decryptor) {

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(),