media/filters/ffmpeg_audio_decoder.cc - Issue 909002: Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include.

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 909002: Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include. (Closed)

Patch Set: Updated 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:

Index: media/filters/ffmpeg_audio_decoder.cc

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

index b7a828b065c57548aa1ad542260d962dd30ebe00..82e36f259345f8a5d6fa15d89a0307fa9b7233d5 100644

--- a/media/filters/ffmpeg_audio_decoder.cc

+++ b/media/filters/ffmpeg_audio_decoder.cc

@@ -61,11 +61,8 @@ void FFmpegAudioDecoder::DoInitialize(DemuxerStream* demuxer_stream,

// Serialize calls to avcodec_open().

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

- {

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

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

- return;

- }

+ 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 »