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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/media_win.cc

Issue 9447029: Second attempt to land ffmpeg roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 10 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/ffmpeg/ffmpeg_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/media_win.cc
diff --git a/media/base/media_win.cc b/media/base/media_win.cc
index 6b4c07e92d6aef0e6ab39efb6f48b1ab82d04a01..9751892f56e4295c56c92b51df8843749f8de7a8 100644
--- a/media/base/media_win.cc
+++ b/media/base/media_win.cc
@@ -28,9 +28,9 @@ static const char* GetDLLName(FFmpegDLLKeys dll_key) {
// TODO(ajwong): Do we want to lock to a specific ffmpeg version?
switch (dll_key) {
case FILE_LIBAVCODEC:
- return "avcodec-53.dll";
+ return "avcodec-54.dll";
case FILE_LIBAVFORMAT:
- return "avformat-53.dll";
+ return "avformat-54.dll";
case FILE_LIBAVUTIL:
return "avutil-51.dll";
default:
« no previous file with comments | « media/base/media_posix.cc ('k') | media/ffmpeg/ffmpeg_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698