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

Unified Diff: ffmpeg/source/config/ChromeOS/linux/arm/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/ChromeOS/linux/arm/config.h
diff --git a/ffmpeg/source/config/ChromeOS/linux/arm/config.h b/ffmpeg/source/config/ChromeOS/linux/arm/config.h
index 8e9411b289de2af1bc302581532bb17d05f5b263..0e9f33dee2684c4452a40f76e464b150e4988bb1 100644
--- a/ffmpeg/source/config/ChromeOS/linux/arm/config.h
+++ b/ffmpeg/source/config/ChromeOS/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 --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 --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 --enable-decoder=mpeg4 --enable-demuxer=avi --enable-bsf=mpeg4video_es --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-decoder=vp8 --enable-parser=vp8 --enable-demuxer=flac --enable-decoder=flac"
+#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 --enable-decoder=mpeg4 --enable-demuxer=avi --enable-bsf=mpeg4video_es --enable-demuxer=amr --enable-decoder='amrnb,amrwb' --enable-demuxer=flac --enable-decoder=flac"
#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
« no previous file with comments | « ffmpeg/source/config/ChromeOS/linux/arm-neon/config.h ('k') | ffmpeg/source/config/ChromeOS/linux/ia32/config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698