media/base/media_posix.cc - Issue 6993042: ffmpeg chromium glue

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/base/media_posix.cc

Issue 6993042: ffmpeg chromium glue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: removing divx and xdiv Created 9 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: media/base/media_posix.cc

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

--- media/base/media_posix.cc (revision 91003)

+++ media/base/media_posix.cc (working copy)

@@ -54,11 +54,11 @@

// TODO(ajwong): Remove this once mac is migrated. Either that, or have GYP

// set a constant that we can switch implementations based off of.

switch (stub_key) {

- case tp_ffmpeg::kModuleAvcodec52:

+ case tp_ffmpeg::kModuleAvcodec53:

return FILE_PATH_LITERAL(DSO_NAME("avcodec", AVCODEC_VERSION));

- case tp_ffmpeg::kModuleAvformat52:

+ case tp_ffmpeg::kModuleAvformat53:

return FILE_PATH_LITERAL(DSO_NAME("avformat", AVFORMAT_VERSION));

- case tp_ffmpeg::kModuleAvutil50:

+ case tp_ffmpeg::kModuleAvutil51:

return FILE_PATH_LITERAL(DSO_NAME("avutil", AVUTIL_VERSION));

default:

LOG(DFATAL) << "Invalid stub module requested: " << stub_key;