Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(524)

Unified Diff: ffmpeg/source/config/Chromium/linux/arm-neon/config.h

Issue 7659006: Remove libvpx from FFmpeg in favour of ffvp8. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party
Patch Set: fixes Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ffmpeg/source/config/Chromium/linux/arm-neon/config.h
diff --git a/ffmpeg/source/config/Chromium/linux/arm-neon/config.h b/ffmpeg/source/config/Chromium/linux/arm-neon/config.h
index 5bb78c9d8437647aed9974964d19b35604727b91..e429c170a9e58913ef37c0ffb3c3715d32ab5ff7 100644
--- a/ffmpeg/source/config/Chromium/linux/arm-neon/config.h
+++ b/ffmpeg/source/config/Chromium/linux/arm-neon/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 --disable-libvpx --enable-decoder='theora,vorbis' --disable-encoder=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 --enable-neon --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi- --extra-cflags='-march=armv7-a' --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfpu=neon' --extra-cflags='-mfloat-abi=softfp' --extra-cflags=-I../../../libvpx/include --extra-ldflags=-L../../../libvpx/lib/linux/arm-neon"
+#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 --enable-neon --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi- --extra-cflags='-march=armv7-a' --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfpu=neon' --extra-cflags='-mfloat-abi=softfp'"
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
#define CC_TYPE "gcc"
@@ -156,7 +156,7 @@
#define CONFIG_INDEVS 0
#define CONFIG_MUXERS 0
#define CONFIG_OUTDEVS 0
-#define CONFIG_PARSERS 0
+#define CONFIG_PARSERS 1
#define CONFIG_PROTOCOLS 1
#define CONFIG_AANDCT 0
#define CONFIG_AC3DSP 0
@@ -182,7 +182,7 @@
#define CONFIG_GPL 0
#define CONFIG_GRAY 0
#define CONFIG_H264DSP 0
-#define CONFIG_H264PRED 0
+#define CONFIG_H264PRED 1
#define CONFIG_HARDCODED_TABLES 0
#define CONFIG_HUFFMAN 0
#define CONFIG_LIBCELT 0
@@ -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
« no previous file with comments | « ffmpeg/source/config/ChromeOS/linux/x64/config.asm ('k') | ffmpeg/source/config/Chromium/linux/arm/config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698