Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(346)

Unified Diff: media/base/media_win.cc

Issue 6993042: ffmpeg chromium glue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: once more new test_expectations.txt Created 9 years, 6 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
« no previous file with comments | « media/base/media_posix.cc ('k') | media/base/mock_ffmpeg.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/media_win.cc
===================================================================
--- media/base/media_win.cc (revision 91170)
+++ media/base/media_win.cc (working copy)
@@ -25,11 +25,11 @@
// TODO(ajwong): Do we want to lock to a specific ffmpeg version?
switch (dll_key) {
case FILE_LIBAVCODEC:
- return FILE_PATH_LITERAL("avcodec-52.dll");
+ return FILE_PATH_LITERAL("avcodec-53.dll");
case FILE_LIBAVFORMAT:
- return FILE_PATH_LITERAL("avformat-52.dll");
+ return FILE_PATH_LITERAL("avformat-53.dll");
case FILE_LIBAVUTIL:
- return FILE_PATH_LITERAL("avutil-50.dll");
+ return FILE_PATH_LITERAL("avutil-51.dll");
default:
LOG(DFATAL) << "Invalid DLL key requested: " << dll_key;
return FILE_PATH_LITERAL("");
« no previous file with comments | « media/base/media_posix.cc ('k') | media/base/mock_ffmpeg.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698