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

Unified Diff: source/config/ChromeOS/linux/arm/config.h

Issue 3390002: ffmpeg config files for sept 09 ffmpeg and enable wav and vp8 encode... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 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
« no previous file with comments | « source/config/ChromeOS/linux/arm-neon/config.h ('k') | source/config/ChromeOS/linux/ia32/config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/config/ChromeOS/linux/arm/config.h
===================================================================
--- source/config/ChromeOS/linux/arm/config.h (revision 59334)
+++ source/config/ChromeOS/linux/arm/config.h (working copy)
@@ -1,7 +1,7 @@
/* Automatically generated by configure - do not modify! */
#ifndef FFMPEG_CONFIG_H
#define FFMPEG_CONFIG_H
-#define FFMPEG_CONFIGURATION "--disable-everything --disable-network --disable-bzlib --disable-zlib --enable-shared --enable-decoder='theora,vorbis,libvpx,aac,h264,mp3,wmv1,wmv2,wmv3,wmav1,wmav2,wmapro,mpeg4,pcm_u8,pcm_s16le,pcm_f32le' --enable-demuxer='ogg,matroska,mp3,mov,avi,wav,asf' --enable-parser=mpegaudio --enable-bsf='h264_mp4toannexb,mpeg4video_es,vc1_asftorcv,vc1_asftoannexg' --enable-cross-compile --arch=arm --target-os=linux --enable-armv6 --enable-armv6t2 --enable-armvfp --disable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp'"
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-network --disable-bzlib --disable-zlib --enable-shared --enable-decoder='theora,vorbis,libvpx,pcm_u8,pcm_s16le,pcm_f32le,aac,h264,mp3,wmv1,wmv2,wmv3,wmav1,wmav2,wmapro,mpeg4,pcm_u8,pcm_s16le,pcm_f32le' --enable-encoder=libvpx --enable-demuxer='ogg,matroska,wav,mp3,mov,avi,wav,asf' --enable-parser=mpegaudio --enable-bsf='h264_mp4toannexb,mpeg4video_es,vc1_asftorcv,vc1_asftoannexg' --enable-cross-compile --arch=arm --target-os=linux --enable-armv6 --enable-armv6t2 --enable-armvfp --disable-neon --cross-prefix=/usr/local/google/cross-tools/arm-2009q3/bin/arm-none-linux-gnueabi- --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp'"
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
#define CC_TYPE "gcc"
@@ -459,6 +459,7 @@
#define CONFIG_ADPCM_EA_R2_DECODER 0
#define CONFIG_ADPCM_EA_R3_DECODER 0
#define CONFIG_ADPCM_EA_XAS_DECODER 0
+#define CONFIG_ADPCM_G722_DECODER 0
#define CONFIG_ADPCM_G726_DECODER 0
#define CONFIG_ADPCM_IMA_AMV_DECODER 0
#define CONFIG_ADPCM_IMA_DK3_DECODER 0
@@ -491,6 +492,8 @@
#define CONFIG_LIBSCHROEDINGER_DECODER 0
#define CONFIG_LIBSPEEX_DECODER 0
#define CONFIG_LIBVPX_DECODER 0
+#define CONFIG_A64MULTI_ENCODER 0
+#define CONFIG_A64MULTI5_ENCODER 0
#define CONFIG_ASV1_ENCODER 0
#define CONFIG_ASV2_ENCODER 0
#define CONFIG_BMP_ENCODER 0
@@ -647,6 +650,7 @@
#define CONFIG_ANM_DEMUXER 0
#define CONFIG_APC_DEMUXER 0
#define CONFIG_APE_DEMUXER 0
+#define CONFIG_APPLEHTTP_DEMUXER 0
#define CONFIG_ASF_DEMUXER 1
#define CONFIG_ASS_DEMUXER 0
#define CONFIG_AU_DEMUXER 0
@@ -676,6 +680,7 @@
#define CONFIG_FLIC_DEMUXER 0
#define CONFIG_FLV_DEMUXER 0
#define CONFIG_FOURXM_DEMUXER 0
+#define CONFIG_G722_DEMUXER 0
#define CONFIG_GSM_DEMUXER 0
#define CONFIG_GXF_DEMUXER 0
#define CONFIG_H261_DEMUXER 0
@@ -777,6 +782,7 @@
#define CONFIG_YOP_DEMUXER 0
#define CONFIG_YUV4MPEGPIPE_DEMUXER 0
#define CONFIG_LIBNUT_DEMUXER 0
+#define CONFIG_A64_MUXER 0
#define CONFIG_AC3_MUXER 0
#define CONFIG_ADTS_MUXER 0
#define CONFIG_AIFF_MUXER 0
@@ -801,6 +807,7 @@
#define CONFIG_FLV_MUXER 0
#define CONFIG_FRAMECRC_MUXER 0
#define CONFIG_FRAMEMD5_MUXER 0
+#define CONFIG_G722_MUXER 0
#define CONFIG_GIF_MUXER 0
#define CONFIG_GXF_MUXER 0
#define CONFIG_H261_MUXER 0
@@ -874,9 +881,12 @@
#define CONFIG_WEBM_MUXER 0
#define CONFIG_YUV4MPEGPIPE_MUXER 0
#define CONFIG_LIBNUT_MUXER 0
+#define CONFIG_ANULL_FILTER 0
#define CONFIG_ASPECT_FILTER 0
#define CONFIG_CROP_FILTER 0
+#define CONFIG_FIFO_FILTER 0
#define CONFIG_FORMAT_FILTER 0
+#define CONFIG_HFLIP_FILTER 0
#define CONFIG_NOFORMAT_FILTER 0
#define CONFIG_NULL_FILTER 0
#define CONFIG_PAD_FILTER 0
@@ -894,6 +904,7 @@
#define CONFIG_FILE_PROTOCOL 0
#define CONFIG_GOPHER_PROTOCOL 0
#define CONFIG_HTTP_PROTOCOL 0
+#define CONFIG_MMSH_PROTOCOL 0
#define CONFIG_MMST_PROTOCOL 0
#define CONFIG_MD5_PROTOCOL 0
#define CONFIG_PIPE_PROTOCOL 0
« no previous file with comments | « source/config/ChromeOS/linux/arm-neon/config.h ('k') | source/config/ChromeOS/linux/ia32/config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698