summaryrefslogtreecommitdiffstats
path: root/media/build
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 18:06:25 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 18:06:25 +0000
commit35751ccc3151bdca7383a3368d26834511125f24 (patch)
treec5123b55aec70f35cea48a7a77e60d2a022d3f3b /media/build
parent048539b80280b675fb545ad846e3b912da1c7a0f (diff)
downloadchromium_src-35751ccc3151bdca7383a3368d26834511125f24.zip
chromium_src-35751ccc3151bdca7383a3368d26834511125f24.tar.gz
chromium_src-35751ccc3151bdca7383a3368d26834511125f24.tar.bz2
Checking in media::FFmpegDemuxer and tests.
FFmpegDemuxer is a Demuxer implemenation using FFmpeg's libavformat. It is written in a way to work with any format and assume that the downstream decoders can interpret FFmpeg's CodecID enumerations. Review URL: http://codereview.chromium.org/39295 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/build')
-rw-r--r--media/build/media.vcproj8
-rw-r--r--media/build/media_unittests.vcproj4
2 files changed, 12 insertions, 0 deletions
diff --git a/media/build/media.vcproj b/media/build/media.vcproj
index d0a78f6..37b7977 100644
--- a/media/build/media.vcproj
+++ b/media/build/media.vcproj
@@ -221,6 +221,14 @@
>
</File>
<File
+ RelativePath="..\filters\ffmpeg_demuxer.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\filters\ffmpeg_demuxer.h"
+ >
+ </File>
+ <File
RelativePath="..\filters\ffmpeg_glue.cc"
>
</File>
diff --git a/media/build/media_unittests.vcproj b/media/build/media_unittests.vcproj
index 214bab6d3..4e18337 100644
--- a/media/build/media_unittests.vcproj
+++ b/media/build/media_unittests.vcproj
@@ -192,6 +192,10 @@
Name="filters"
>
<File
+ RelativePath="..\filters\ffmpeg_demuxer_unittest.cc"
+ >
+ </File>
+ <File
RelativePath="..\filters\ffmpeg_glue_unittest.cc"
>
</File>