summaryrefslogtreecommitdiffstats
path: root/third_party/ffmpeg/ffmpeg.gyp
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-18 05:24:25 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-18 05:24:25 +0000
commit87970dc239839fc987583ceb8b663dde2303ef97 (patch)
treeea0cb014a7eb410cc1783d8801f4f8ac7f98649c /third_party/ffmpeg/ffmpeg.gyp
parentf49ce6c5e28da56bee32e6328fb1ae685b27f37f (diff)
downloadchromium_src-87970dc239839fc987583ceb8b663dde2303ef97.zip
chromium_src-87970dc239839fc987583ceb8b663dde2303ef97.tar.gz
chromium_src-87970dc239839fc987583ceb8b663dde2303ef97.tar.bz2
Revert 39335 - ffmpeg add WAV support for chromiumos media player.
BUG=32756 TEST=build with chromeos=1 and branding=Chromium Review URL: http://codereview.chromium.org/641001 TBR=fbarchard@chromium.org Review URL: http://codereview.chromium.org/647002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg/ffmpeg.gyp')
-rwxr-xr-xthird_party/ffmpeg/ffmpeg.gyp8
1 files changed, 2 insertions, 6 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index b4b1148..c83fced 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -182,12 +182,6 @@
'source/patched-ffmpeg-mt/libavutil/intfloat_readwrite.c',
],
}], # ffmpeg_branding
- ['ffmpeg_branding=="ChromiumOS" or ffmpeg_branding=="ChromeOS"', {
- 'sources': [
- 'source/patched-ffmpeg-mt/libavcodec/pcm.c',
- 'source/patched-ffmpeg-mt/libavformat/wav.c',
- ],
- }], # ffmpeg_branding
['ffmpeg_branding=="ChromeOS"', {
'sources': [
'source/patched-ffmpeg-mt/libavcodec/h263.c',
@@ -203,6 +197,7 @@
'source/patched-ffmpeg-mt/libavcodec/mpeg4videodec.c', # TODO(fbarchard): Review this file.
'source/patched-ffmpeg-mt/libavcodec/msmpeg4.c',
'source/patched-ffmpeg-mt/libavcodec/msmpeg4data.c',
+ 'source/patched-ffmpeg-mt/libavcodec/pcm.c',
'source/patched-ffmpeg-mt/libavcodec/vc1.c',
'source/patched-ffmpeg-mt/libavcodec/vc1data.c',
'source/patched-ffmpeg-mt/libavcodec/vc1dec.c', # TODO(fbarchard): Review this file.
@@ -217,6 +212,7 @@
'source/patched-ffmpeg-mt/libavformat/avidec.c',
'source/patched-ffmpeg-mt/libavformat/avlanguage.c', # TODO(fbarchard): Review this file.
'source/patched-ffmpeg-mt/libavformat/raw.c',
+ 'source/patched-ffmpeg-mt/libavformat/wav.c',
'source/patched-ffmpeg-mt/libavutil/des.c',
'source/patched-ffmpeg-mt/libavutil/rc4.c',
],