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

Unified Diff: ffmpeg/source/config/Chromium/win/ia32/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/win/ia32/config.h
diff --git a/ffmpeg/source/config/Chromium/win/ia32/config.h b/ffmpeg/source/config/Chromium/win/ia32/config.h
index c0c456c553177e46e74fc6a4169dfb63268a9628..d19b397c39d4907dc42c6b3052e4db87e427b231 100644
--- a/ffmpeg/source/config/Chromium/win/ia32/config.h
+++ b/ffmpeg/source/config/Chromium/win/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-everything --enable-fft --enable-rdft --disable-network --disable-bzlib --disable-zlib --disable-swscale --disable-amd3dnow --disable-amd3dnowext --enable-shared --enable-libvpx --enable-decoder='theora,vorbis,libvpx' --enable-encoder=libvpx --enable-decoder='pcm_u8,pcm_s16le,pcm_f32le' --enable-demuxer='ogg,matroska,wav' --enable-filter=buffer --enable-memalign-hack --cc=mingw32-gcc --extra-cflags='-mtune=atom' --extra-cflags=-U__STRICT_ANSI__ --extra-cflags=-I/usr/local/include --extra-ldflags=-L/usr/local/lib --extra-ldflags=--enable-auto-import --extra-cflags=-I../../../libvpx/include --extra-ldflags=-L../../../libvpx/lib/win/ia32"
+#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-filter=buffer --enable-memalign-hack --cc=mingw32-gcc --extra-cflags='-mtune=atom' --extra-cflags=-U__STRICT_ANSI__ --extra-cflags=-I/usr/local/include --extra-ldflags=-L/usr/local/lib --extra-ldflags=--enable-auto-import"
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
#define CC_TYPE "gcc"
@@ -150,13 +150,13 @@
#define CONFIG_BSFS 0
#define CONFIG_DECODERS 1
#define CONFIG_DEMUXERS 1
-#define CONFIG_ENCODERS 1
+#define CONFIG_ENCODERS 0
#define CONFIG_FILTERS 1
#define CONFIG_HWACCELS 0
#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
@@ -529,7 +529,7 @@
#define CONFIG_LIBOPENJPEG_DECODER 0
#define CONFIG_LIBSCHROEDINGER_DECODER 0
#define CONFIG_LIBSPEEX_DECODER 0
-#define CONFIG_LIBVPX_DECODER 1
+#define CONFIG_LIBVPX_DECODER 0
#define CONFIG_A64MULTI_ENCODER 0
#define CONFIG_A64MULTI5_ENCODER 0
#define CONFIG_ASV1_ENCODER 0
@@ -642,7 +642,7 @@
#define CONFIG_LIBVO_AACENC_ENCODER 0
#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
#define CONFIG_LIBVORBIS_ENCODER 0
-#define CONFIG_LIBVPX_ENCODER 1
+#define CONFIG_LIBVPX_ENCODER 0
#define CONFIG_LIBX264_ENCODER 0
#define CONFIG_LIBXAVS_ENCODER 0
#define CONFIG_LIBXVID_ENCODER 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/Chromium/mac/ia32/config.asm ('k') | ffmpeg/source/config/Chromium/win/ia32/config.asm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698