media/base/media_win.cc - Issue 9317096: Fix media code to work with new ffmpeg.

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_win.cc

Issue 9317096: Fix media code to work with new ffmpeg. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix deprecated methods. Created 8 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:

Index: media/base/media_win.cc

diff --git a/media/base/media_win.cc b/media/base/media_win.cc

index 9462c0281f34cd74442c8e3ee08f1943410f5acb..656269094771da7d4c849424bd9c3f785941e237 100644

--- a/media/base/media_win.cc

+++ b/media/base/media_win.cc

@@ -25,9 +25,9 @@ static FilePath::CharType* GetDLLName(FFmpegDLLKeys dll_key) {

// TODO(ajwong): Do we want to lock to a specific ffmpeg version?

switch (dll_key) {

case FILE_LIBAVCODEC:

- return FILE_PATH_LITERAL("avcodec-53.dll");

+ return FILE_PATH_LITERAL("avcodec-54.dll");

case FILE_LIBAVFORMAT:

- return FILE_PATH_LITERAL("avformat-53.dll");

+ return FILE_PATH_LITERAL("avformat-54.dll");

case FILE_LIBAVUTIL:

return FILE_PATH_LITERAL("avutil-51.dll");

default: