media/ffmpeg/ffmpeg_common.cc - Issue 1240002: Revert 42415 - Removed custom FFmpegLock. Removed ffmpeg headers from third_p...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "media/ffmpeg/ffmpeg_common.h"	5 #include "media/ffmpeg/ffmpeg_common.h"

6	6

7 namespace media {	7 namespace media {

8	8

	9 FFmpegLock::FFmpegLock() {

	10 }

	11

	12 FFmpegLock::~FFmpegLock() {

	13 }

	14

	15 Lock& FFmpegLock::lock() {

	16 return lock_;

	17 }

	18

9 namespace mime_type {	19 namespace mime_type {

10	20

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

12 const char kFFmpegVideo[] = "video/x-ffmpeg";	22 const char kFFmpegVideo[] = "video/x-ffmpeg";

13	23

14 } // namespace mime_type	24 } // namespace mime_type

15	25

16 } // namespace media	26 } // namespace media

OLD	NEW

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