media/filters/ffmpeg_glue.h - Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

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_glue.h

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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_glue.h

diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h

index 4f991d16c8686321f1ddb6bf2cf9f4391bb4e2f4..aa1267078148a6365442618e7885c804c8d4b343 100644

--- a/media/filters/ffmpeg_glue.h

+++ b/media/filters/ffmpeg_glue.h

@@ -29,8 +29,8 @@

#include <map>

#include <string>

-#include "base/lock.h"

#include "base/singleton.h"

+#include "base/synchronization/lock.h"

namespace media {

@@ -93,7 +93,7 @@ class FFmpegGlue {

std::string GetProtocolKey(FFmpegURLProtocol* protocol);

// Mutual exclusion while adding/removing items from the map.

- Lock lock_;

+ base::Lock lock_;

// Map between keys and FFmpegProtocol references.

typedef std::map<std::string, FFmpegURLProtocol*> ProtocolMap;

« no previous file with comments | « media/filters/audio_renderer_base.cc ('k') | media/filters/ffmpeg_glue.cc » ('j') | no next file with comments »