diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 14:09:29 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 14:09:29 +0000 |
| commit | 23e54647b9a000d92d1c1ab1a44991131a4cb7e9 (patch) | |
| tree | a88a65de29e44d1722b23cc4d70034d1806a3196 /media | |
| parent | 4fd55c80d7860e1872a2bc5bb0a89efc3ba856d7 (diff) | |
| download | chromium_src-23e54647b9a000d92d1c1ab1a44991131a4cb7e9.zip chromium_src-23e54647b9a000d92d1c1ab1a44991131a4cb7e9.tar.gz chromium_src-23e54647b9a000d92d1c1ab1a44991131a4cb7e9.tar.bz2 | |
Exclude the GPU video decoder from the build for Android.
The decoder relies on ffmpeg as a fall-back for video decoding when
the GPU isn't able to process the video, while ffmpeg may not be available.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8933030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/media.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp index 265ca69..b20e630 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -298,6 +298,8 @@ 'filters/ffmpeg_glue.h', 'filters/ffmpeg_video_decoder.cc', 'filters/ffmpeg_video_decoder.h', + 'filters/gpu_video_decoder.cc', + 'filters/gpu_video_decoder.h', ], }], # The below 'android' condition were added temporarily and should be |