Revert 42415 - Removed custom FFmpegLock. Removed ffmpeg headers from third_p...

DEPS

 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
   "webkit_revision": "56426",
   "ffmpeg_revision": "42314",
   "skia_revision": "504",
   "chromium_git": "http://src.chromium.org/git",
   "swig_revision": "40423",
   "nacl_revision": "1760",
 }
@@ skipping 83 matching lines @@
     Var("webkit_revision"),
   "src/chrome/test/data/layout_tests/LayoutTests/storage/domstorage":
     Var("webkit_trunk") + "/LayoutTests/storage/domstorage@" +
     Var("webkit_revision"),
   "src/chrome/test/data/layout_tests/LayoutTests/websocket/tests/workers":
     Var("webkit_trunk") + "/LayoutTests/websocket/tests/workers@" +
     Var("webkit_revision"),
 
   "src/third_party/swig/Lib":
     "/trunk/deps/third_party/swig/Lib@" + Var("swig_revision"),
-
-  "src/third_party/ffmpeg/source/patched-ffmpeg-mt":
-    "/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" +
-    Var("ffmpeg_revision"),
 }
 
 
 deps_os = {
   "win": {
     "src/chrome/tools/test/reference_build/chrome":
       "/trunk/deps/reference_builds/chrome@41984",
 
     "src/third_party/cygwin":
       "/trunk/deps/third_party/cygwin@11984",
@@ skipping 44 matching lines @@
       "/trunk/deps/third_party/lighttpd@33737",
 
     "src/third_party/WebKit/WebKit/mac":
       Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"),
     "src/third_party/WebKit/WebKitLibraries":
       Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),
 
     # TODO(ajwong): Move this into the OS-independent block.
     "src/third_party/yasm/source/patched-yasm":
       "/trunk/deps/third_party/yasm/patched-yasm@29937",
+    "src/third_party/ffmpeg/source/patched-ffmpeg-mt":
+      "/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" +
+      Var("ffmpeg_revision"),
 
     "src/third_party/swig/mac":
       "/trunk/deps/third_party/swig/mac@" + Var("swig_revision"),
 
     "src/tools/gyp":
       "http://gyp.googlecode.com/svn/trunk@800",
   },
   "unix": {
     # Linux, really.
     "src/chrome/tools/test/reference_build/chrome_linux":
       "/trunk/deps/reference_builds/chrome_linux@41515",
 
     "src/third_party/xdg-utils":
       "/trunk/deps/third_party/xdg-utils@29103",
 
     # TODO(ajwong): Move this into the OS-independent block.
     "src/third_party/yasm/source/patched-yasm":
       "/trunk/deps/third_party/yasm/patched-yasm@29937",
+    "src/third_party/ffmpeg/source/patched-ffmpeg-mt":
+      "/trunk/deps/third_party/ffmpeg/patched-ffmpeg-mt@" +
+      Var("ffmpeg_revision"),
 
     "src/third_party/swig/linux":
       "/trunk/deps/third_party/swig/linux@" + Var("swig_revision"),
 
     "src/tools/gyp":
       "http://gyp.googlecode.com/svn/trunk@800",
   },
 }
 
 
@@ skipping 36 matching lines @@
     "action": ["python", "src/build/gyp_chromium"],
   },
   {
     # Workaround XCode dependecies problem.
     # TODO(bradnelson): remove this when fixed.
     "pattern": ".",
     "action": ["python",
                "src/build/mac/clobber_generated_headers.py"],
   },
 ]