summaryrefslogtreecommitdiffstats
path: root/media/DEPS
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-11 21:22:21 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-11 21:22:21 +0000
commita7542f344f1f6784071be2fc3e17db7cc0764566 (patch)
treebdb6d82abb4fa912a786bbe53e970725fcb83051 /media/DEPS
parent8d5a34e2b9853514b5fc5cb33be629f452e558eb (diff)
downloadchromium_src-a7542f344f1f6784071be2fc3e17db7cc0764566.zip
chromium_src-a7542f344f1f6784071be2fc3e17db7cc0764566.tar.gz
chromium_src-a7542f344f1f6784071be2fc3e17db7cc0764566.tar.bz2
Revert "Revert r18122: "Reapply ffmpeg changes." (it broke the Linux make build)."
This reverts commit r18168 and reapplies r18122. I.e., this reapplies the ffmpeg changes. Review URL: http://codereview.chromium.org/125003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/DEPS')
-rw-r--r--media/DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/DEPS b/media/DEPS
index 2b2d7d8..3d2daa9 100644
--- a/media/DEPS
+++ b/media/DEPS
@@ -1,3 +1,3 @@
include_rules = [
- "+third_party/ffmpeg/include",
+ "+third_party/ffmpeg",
]