Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include.
Patch by [email protected]
BUG=23271
TEST=none
Review URL: http://codereview.chromium.org/1289003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42573 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/DEPS b/DEPS
index 55019b8..98e7758 100644
--- a/DEPS
+++ b/DEPS
@@ -101,6 +101,10 @@
"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"),
}
@@ -165,9 +169,6 @@
# 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"),
@@ -186,9 +187,6 @@
# 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"),
