media/filters/ffmpeg_audio_decoder.cc - Issue 854006: Revert 41386 - Removed custom FFmpegLock. Removed ffmpeg headers from third_p...

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/ffmpeg_audio_decoder.cc

Issue 854006: Revert 41386 - Removed custom FFmpegLock. Removed ffmpeg headers from third_p... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years, 9 months 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

Index: media/filters/ffmpeg_audio_decoder.cc

===================================================================

--- media/filters/ffmpeg_audio_decoder.cc (revision 41387)

+++ media/filters/ffmpeg_audio_decoder.cc (working copy)

@@ -61,8 +61,11 @@

// Serialize calls to avcodec_open().

AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);

- if (!codec || avcodec_open(codec_context_, codec) < 0) {

- return;

+ {

+ AutoLock auto_lock(FFmpegLock::get()->lock());

+ if (!codec || avcodec_open(codec_context_, codec) < 0) {

+ return;

+ }

}

// When calling avcodec_find_decoder(), |codec_context_| might be altered by

« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »