Glue ffmpeg to Chrome

1) works for Linux, OSX, Windows
2) mostly renaming #defines
3) avcodec_thread_init is deprecated and has been removed, see
   http://ffmpeg.org/pipermail/ffmpeg-cvslog/2011-February/034326.html
4) will require a rebaseline of 
   platform/chromium-mac/media/video-currentTime-set-expected.txt
   platform/chromium-win/media/video-currentTime-set-expected.txt
   with a change of
   -video.currentTime.toFixed(2) == '5.82'
   +video.currentTime.toFixed(2) == '5.81'


BUG=87831
TESTS=ran Theora Testsuite, media tests, WebKit media tests
Review URL: http://codereview.chromium.org/6993042

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91259 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 10 deletions

diff --git a/media/base/media_posix.cc b/media/base/media_posix.cc
index 3621bd6..2c05376 100644
--- a/media/base/media_posix.cc
+++ b/media/base/media_posix.cc
@@ -54,11 +54,11 @@ static std::string GetDSOName(tp_ffmpeg::StubModules stub_key) {
   // 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;
diff --git a/media/base/media_win.cc b/media/base/media_win.cc
index 6d40130..a58d977 100644
--- a/media/base/media_win.cc
+++ b/media/base/media_win.cc
@@ -25,11 +25,11 @@ 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-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("");
diff --git a/media/base/mock_ffmpeg.cc b/media/base/mock_ffmpeg.cc
index c91c081..ebbfbf0 100644
--- a/media/base/mock_ffmpeg.cc
+++ b/media/base/mock_ffmpeg.cc
@@ -112,10 +112,6 @@ int avcodec_close(AVCodecContext* avctx) {
   return MockFFmpeg::get()->AVCodecClose(avctx);
 }
 
-int avcodec_thread_init(AVCodecContext* avctx, int threads) {
-  return MockFFmpeg::get()->AVCodecThreadInit(avctx, threads);
-}
-
 void avcodec_flush_buffers(AVCodecContext* avctx) {
   return MockFFmpeg::get()->AVCodecFlushBuffers(avctx);
 }