From d77ed9ef01dd6508ed6f153acbe71f95b9f38480 Mon Sep 17 00:00:00 2001 From: "scherkus@chromium.org" Date: Tue, 10 Mar 2009 19:09:28 +0000 Subject: Checking in media::FFmpegGlue, media::FFmpegDemuxer and tests. Fixes build break by including FFmpeg dependency for media project in chrome.sln. This is a second attempt at committing the following changelists: http://codereview.chromium.org/39295 http://codereview.chromium.org/28165 TBR=darin Review URL: http://codereview.chromium.org/42029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11356 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/chrome.sln | 3 +++ 1 file changed, 3 insertions(+) (limited to 'chrome/chrome.sln') diff --git a/chrome/chrome.sln b/chrome/chrome.sln index bd01935..090f209 100644 --- a/chrome/chrome.sln +++ b/chrome/chrome.sln @@ -585,6 +585,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_perftests", "..\net\bui EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "..\media\build\media.vcproj", "{6AE76406-B03B-11DD-94B1-80B556D89593}" + ProjectSection(ProjectDependencies) = postProject + {D7A94F58-576A-45D9-A45F-EB87C63ABBB0} = {D7A94F58-576A-45D9-A45F-EB87C63ABBB0} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media_unittests", "..\media\build\media_unittests.vcproj", "{C8C6183C-B03C-11DD-B471-DFD256D89593}" ProjectSection(ProjectDependencies) = postProject -- cgit v1.1