| Index: ffmpeg/source/config/Chrome/linux/arm/config.h
|
| diff --git a/ffmpeg/source/config/Chrome/linux/arm/config.h b/ffmpeg/source/config/Chrome/linux/arm/config.h
|
| index c4af3e195473c6fdc45e35899cca8ff5e26a572d..a2a37a7053c4257285ff1a8f4fb6955e2998c958 100644
|
| --- a/ffmpeg/source/config/Chrome/linux/arm/config.h
|
| +++ b/ffmpeg/source/config/Chrome/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-everything --enable-fft --enable-rdft --disable-network --disable-bzlib --disable-zlib --disable-swscale --disable-amd3dnow --disable-amd3dnowext --enable-shared --enable-decoder='theora,vorbis,libvpx' --enable-decoder='pcm_u8,pcm_s16le,pcm_f32le' --enable-demuxer='ogg,matroska,wav' --enable-cross-compile --arch=arm --target-os=linux --enable-armv6 --enable-armv6t2 --enable-armvfp --disable-neon --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi- --extra-cflags='-march=armv7-a' --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfpu=vfp' --extra-cflags='-mfloat-abi=softfp' --extra-cflags=-I../../../libvpx/include --extra-ldflags=-L../../../libvpx/lib/linux/arm --enable-decoder='aac,h264,mp3' --enable-demuxer='mp3,mov' --enable-parser=mpegaudio --enable-bsf=h264_mp4toannexb"
|
| +#define FFMPEG_CONFIGURATION "--disable-everything --enable-fft --enable-rdft --disable-network --disable-bzlib --disable-zlib --disable-swscale --disable-amd3dnow --disable-amd3dnowext --enable-shared --enable-decoder='theora,vorbis,vp8' --enable-decoder='pcm_u8,pcm_s16le,pcm_f32le' --enable-demuxer='ogg,matroska,wav' --enable-parser=vp8 --enable-cross-compile --arch=arm --target-os=linux --enable-armv6 --enable-armv6t2 --enable-armvfp --disable-neon --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi- --extra-cflags='-march=armv7-a' --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfpu=vfp' --extra-cflags='-mfloat-abi=softfp' --enable-decoder='aac,h264,mp3' --enable-demuxer='mp3,mov' --enable-parser=mpegaudio --enable-bsf=h264_mp4toannexb"
|
| #define FFMPEG_LICENSE "LGPL version 2.1 or later"
|
| #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
|
| #define CC_TYPE "gcc"
|
| @@ -204,7 +204,7 @@
|
| #define CONFIG_LIBVO_AACENC 0
|
| #define CONFIG_LIBVO_AMRWBENC 0
|
| #define CONFIG_LIBVORBIS 0
|
| -#define CONFIG_LIBVPX 1
|
| +#define CONFIG_LIBVPX 0
|
| #define CONFIG_LIBX264 0
|
| #define CONFIG_LIBXAVS 0
|
| #define CONFIG_LIBXVID 0
|
| @@ -385,7 +385,7 @@
|
| #define CONFIG_VP6_DECODER 0
|
| #define CONFIG_VP6A_DECODER 0
|
| #define CONFIG_VP6F_DECODER 0
|
| -#define CONFIG_VP8_DECODER 0
|
| +#define CONFIG_VP8_DECODER 1
|
| #define CONFIG_VQA_DECODER 0
|
| #define CONFIG_WMV1_DECODER 0
|
| #define CONFIG_WMV2_DECODER 0
|
| @@ -679,7 +679,7 @@
|
| #define CONFIG_PNM_PARSER 0
|
| #define CONFIG_VC1_PARSER 0
|
| #define CONFIG_VP3_PARSER 0
|
| -#define CONFIG_VP8_PARSER 0
|
| +#define CONFIG_VP8_PARSER 1
|
| #define CONFIG_AAC_ADTSTOASC_BSF 0
|
| #define CONFIG_CHOMP_BSF 0
|
| #define CONFIG_DUMP_EXTRADATA_BSF 0
|
|
|