Second attempt to land ffmpeg roll.

media/base/media_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/media.h"
 
 #include <windows.h>
 #include <delayimp.h>
 
 #include "base/file_path.h"
@@ skipping 10 matching lines @@
   FILE_LIBAVCODEC,   // full path to libavcodec media decoding library.
   FILE_LIBAVFORMAT,  // full path to libavformat media parsing library.
   FILE_LIBAVUTIL,    // full path to libavutil media utility library.
 };
 
 // Retrieves the DLLName for the given key.
 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:
       LOG(DFATAL) << "Invalid DLL key requested: " << dll_key;
       return "";
   }
 }
 
 static bool g_media_library_is_initialized = false;
 
@@ skipping 75 matching lines @@
 bool IsMediaLibraryInitialized() {
   return g_media_library_is_initialized;
 }
 
 bool InitializeOpenMaxLibrary(const FilePath& module_dir) {
   NOTIMPLEMENTED() << "OpenMAX is not used in Windows.";
   return false;
 }
 
 }  // namespace media