media/ffmpeg/ffmpeg_common.cc - Issue 1240002: Revert 42415 - 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/ffmpeg/ffmpeg_common.cc

Issue 1240002: Revert 42415 - 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/ffmpeg/ffmpeg_common.cc

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

--- media/ffmpeg/ffmpeg_common.cc (revision 42420)

+++ media/ffmpeg/ffmpeg_common.cc (working copy)

@@ -6,6 +6,16 @@

namespace media {

+FFmpegLock::FFmpegLock() {

+FFmpegLock::~FFmpegLock() {

+Lock& FFmpegLock::lock() {

+ return lock_;

namespace mime_type {

const char kFFmpegAudio[] = "audio/x-ffmpeg";

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