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

4 files changed, 17 insertions, 21 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',
               ],
diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
index 0335b31..77a4445 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/arm/config.h
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --disable-gpl --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-demuxer=wav --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-pthreads --enable-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp' --prefix=./chromium-ffmpeg"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --disable-gpl --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-pthreads --enable-cross-compile --arch=arm --enable-armv6 --enable-armv6t2 --enable-armvfp --enable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp' --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -397,14 +397,14 @@
 #define CONFIG_PCM_MULAW_DECODER 0
 #define CONFIG_PCM_S8_DECODER 0
 #define CONFIG_PCM_S16BE_DECODER 0
-#define CONFIG_PCM_S16LE_DECODER 1
+#define CONFIG_PCM_S16LE_DECODER 0
 #define CONFIG_PCM_S16LE_PLANAR_DECODER 0
 #define CONFIG_PCM_S24BE_DECODER 0
 #define CONFIG_PCM_S24DAUD_DECODER 0
 #define CONFIG_PCM_S24LE_DECODER 0
 #define CONFIG_PCM_S32BE_DECODER 0
 #define CONFIG_PCM_S32LE_DECODER 0
-#define CONFIG_PCM_U8_DECODER 1
+#define CONFIG_PCM_U8_DECODER 0
 #define CONFIG_PCM_U16BE_DECODER 0
 #define CONFIG_PCM_U16LE_DECODER 0
 #define CONFIG_PCM_U24BE_DECODER 0
@@ -721,7 +721,7 @@
 #define CONFIG_VOC_DEMUXER 0
 #define CONFIG_VQF_DEMUXER 0
 #define CONFIG_W64_DEMUXER 0
-#define CONFIG_WAV_DEMUXER 1
+#define CONFIG_WAV_DEMUXER 0
 #define CONFIG_WC3_DEMUXER 0
 #define CONFIG_WSAUD_DEMUXER 0
 #define CONFIG_WSVQA_DEMUXER 0
diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h
index d597b8d..7f2e4d897 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --disable-gpl --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-demuxer=wav --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chromium-ffmpeg"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --disable-gpl --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -397,14 +397,14 @@
 #define CONFIG_PCM_MULAW_DECODER 0
 #define CONFIG_PCM_S8_DECODER 0
 #define CONFIG_PCM_S16BE_DECODER 0
-#define CONFIG_PCM_S16LE_DECODER 1
+#define CONFIG_PCM_S16LE_DECODER 0
 #define CONFIG_PCM_S16LE_PLANAR_DECODER 0
 #define CONFIG_PCM_S24BE_DECODER 0
 #define CONFIG_PCM_S24DAUD_DECODER 0
 #define CONFIG_PCM_S24LE_DECODER 0
 #define CONFIG_PCM_S32BE_DECODER 0
 #define CONFIG_PCM_S32LE_DECODER 0
-#define CONFIG_PCM_U8_DECODER 1
+#define CONFIG_PCM_U8_DECODER 0
 #define CONFIG_PCM_U16BE_DECODER 0
 #define CONFIG_PCM_U16LE_DECODER 0
 #define CONFIG_PCM_U24BE_DECODER 0
@@ -721,7 +721,7 @@
 #define CONFIG_VOC_DEMUXER 0
 #define CONFIG_VQF_DEMUXER 0
 #define CONFIG_W64_DEMUXER 0
-#define CONFIG_WAV_DEMUXER 1
+#define CONFIG_WAV_DEMUXER 0
 #define CONFIG_WC3_DEMUXER 0
 #define CONFIG_WSAUD_DEMUXER 0
 #define CONFIG_WSVQA_DEMUXER 0
diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h
index cd3bd72..93ee51a 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h
@@ -1,7 +1,7 @@
 /* Automatically generated by configure - do not modify! */
 #ifndef FFMPEG_CONFIG_H
 #define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --disable-gpl --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-demuxer=wav --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-pthreads --enable-yasm --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --prefix=./chromium-ffmpeg"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --disable-gpl --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-pthreads --enable-yasm --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --prefix=./chromium-ffmpeg"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
 #define CC_TYPE "gcc"
@@ -9,7 +9,7 @@
 #define restrict restrict
 #define ASMALIGN(ZEROBITS) ".align 1 << " #ZEROBITS "\n\t"
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM 
+#define EXTERN_ASM
 #define ARCH_ALPHA 0
 #define ARCH_ARM 0
 #define ARCH_AVR32 0
@@ -69,8 +69,8 @@
 #define HAVE_DLFCN_H 1
 #define HAVE_DLOPEN 1
 #define HAVE_DOS_PATHS 0
-#define HAVE_EBP_AVAILABLE 1
-#define HAVE_EBX_AVAILABLE 1
+#define HAVE_EBP_AVAILABLE 0
+#define HAVE_EBX_AVAILABLE 0
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_FAST_64BIT 1
@@ -397,14 +397,14 @@
 #define CONFIG_PCM_MULAW_DECODER 0
 #define CONFIG_PCM_S8_DECODER 0
 #define CONFIG_PCM_S16BE_DECODER 0
-#define CONFIG_PCM_S16LE_DECODER 1
+#define CONFIG_PCM_S16LE_DECODER 0
 #define CONFIG_PCM_S16LE_PLANAR_DECODER 0
 #define CONFIG_PCM_S24BE_DECODER 0
 #define CONFIG_PCM_S24DAUD_DECODER 0
 #define CONFIG_PCM_S24LE_DECODER 0
 #define CONFIG_PCM_S32BE_DECODER 0
 #define CONFIG_PCM_S32LE_DECODER 0
-#define CONFIG_PCM_U8_DECODER 1
+#define CONFIG_PCM_U8_DECODER 0
 #define CONFIG_PCM_U16BE_DECODER 0
 #define CONFIG_PCM_U16LE_DECODER 0
 #define CONFIG_PCM_U24BE_DECODER 0
@@ -721,7 +721,7 @@
 #define CONFIG_VOC_DEMUXER 0
 #define CONFIG_VQF_DEMUXER 0
 #define CONFIG_W64_DEMUXER 0
-#define CONFIG_WAV_DEMUXER 1
+#define CONFIG_WAV_DEMUXER 0
 #define CONFIG_WC3_DEMUXER 0
 #define CONFIG_WSAUD_DEMUXER 0
 #define CONFIG_WSVQA_DEMUXER 0