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

Unified Diff: DEPS

Issue 9317096: Fix media code to work with new ffmpeg. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix years. 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 | « no previous file | chrome/app/chrome.dll.deps » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: DEPS
diff --git a/DEPS b/DEPS
index 9e0e3e184e877be755d21402855c6732e1ff62c2..32c75d2a8a5616a24adca01a55f5773af177b3f4 100644
--- a/DEPS
+++ b/DEPS
@@ -41,7 +41,12 @@ vars = {
"libphonenumber_revision": "425",
"libvpx_revision": "122996",
"lss_revision": "9",
- "ffmpeg_revision": "122092",
+
+ # These two FFmpeg variables must be updated together. One is used for SVN
+ # checkouts and the other for Git checkouts.
+ "ffmpeg_revision": "123079",
+ "ffmpeg_hash": "8a05b9314610683d837eec3b03306ca7a894bef7",
+
"sfntly_revision": "118",
"skia_revision": "3216",
# Three lines of non-changing comments so that
@@ -252,7 +257,7 @@ deps = {
Var("libvpx_revision"),
"src/third_party/ffmpeg":
- "/trunk/deps/third_party/ffmpeg/source@" +
+ "/trunk/deps/third_party/ffmpeg@" +
Var("ffmpeg_revision"),
"src/third_party/libjingle/source":
@@ -339,9 +344,6 @@ deps_os = {
"src/third_party/lighttpd":
"/trunk/deps/third_party/lighttpd@33727",
- "src/third_party/ffmpeg/binaries/chromium/win/ia32":
- "/trunk/deps/third_party/ffmpeg/binaries/win@" + Var("ffmpeg_revision"),
-
# Chrome Frame related deps
"src/third_party/xulrunner-sdk":
"/trunk/deps/third_party/xulrunner-sdk@119756",
« no previous file with comments | « no previous file | chrome/app/chrome.dll.deps » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698