media/webm/webm_stream_parser.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/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 AFR. 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/webm/webm_stream_parser.cc

diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc

index 89e85d72d3752846e94e22a085c8e3dd55da6b28..f286c0e835bfbdab1d7d75a51aa662b6d39ed487 100644

--- a/media/webm/webm_stream_parser.cc

+++ b/media/webm/webm_stream_parser.cc

@@ -354,7 +354,9 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {

original_audio_config.samples_per_second(),

original_audio_config.extra_data(),

original_audio_config.extra_data_size(),

- is_audio_encrypted, false);

+ original_audio_config.sample_format(),

+ is_audio_encrypted,

+ false);

FireNeedKey(tracks_parser.audio_encryption_key_id());

} else {