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

Unified Diff: third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h

Issue 862005: ffmpeg roll to new source that includes HE AAC... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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 | « third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h
===================================================================
--- third_party/ffmpeg/source/config/ChromiumOS/linux/x64/config.h (revision 41889)
+++ third_party/ffmpeg/source/config/ChromiumOS/linux/x64/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-ffmpeg --disable-ffplay --disable-ffserver --enable-shared --disable-static --disable-debug --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --disable-gpl --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-demuxer=wav --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-pthreads --enable-yasm --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --prefix=./chromium-ffmpeg"
+#define FFMPEG_CONFIGURATION "--disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --enable-shared --disable-static --disable-debug --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --disable-gpl --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-demuxer=wav --enable-decoder=pcm_u8 --enable-decoder=pcm_s16le --enable-pthreads --enable-yasm --arch=x86_64 --extra-cflags=-m64 --extra-ldflags=-m64 --prefix=./chromium-ffmpeg"
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
#define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
#define CC_TYPE "gcc"
@@ -27,6 +27,7 @@
#define ARCH_SH4 0
#define ARCH_SPARC 0
#define ARCH_SPARC64 0
+#define ARCH_TOMI 0
#define ARCH_X86 1
#define ARCH_X86_32 0
#define ARCH_X86_64 1
@@ -80,8 +81,10 @@
#define HAVE_FORK 1
#define HAVE_GETADDRINFO 1
#define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSMEMORYINFO 0
#define HAVE_GETPROCESSTIMES 0
#define HAVE_GETRUSAGE 1
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
#define HAVE_INET_ATON 1
#define HAVE_INLINE_ASM 1
#define HAVE_ISATTY 1
@@ -89,6 +92,8 @@
#define HAVE_LIBDC1394_1 0
#define HAVE_LIBDC1394_2 0
#define HAVE_LLRINT 1
+#define HAVE_LOCAL_ALIGNED_16 1
+#define HAVE_LOCAL_ALIGNED_8 1
#define HAVE_LOG2 1
#define HAVE_LOG2F 1
#define HAVE_LOONGSON 0
@@ -110,6 +115,7 @@
#define HAVE_SOCKLEN_T 0
#define HAVE_SOUNDCARD_H 0
#define HAVE_POLL_H 1
+#define HAVE_SETRLIMIT 1
#define HAVE_STRUCT_ADDRINFO 0
#define HAVE_STRUCT_IPV6_MREQ 0
#define HAVE_STRUCT_SOCKADDR_IN6 0
@@ -155,6 +161,7 @@
#define CONFIG_FASTDIV 1
#define CONFIG_FFMPEG 0
#define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 0
#define CONFIG_FFSERVER 0
#define CONFIG_FFT 1
#define CONFIG_GOLOMB 1
@@ -180,6 +187,7 @@
#define CONFIG_LIBX264 0
#define CONFIG_LIBXVID 0
#define CONFIG_LPC 0
+#define CONFIG_LSP 0
#define CONFIG_MDCT 1
#define CONFIG_MEMALIGN_HACK 0
#define CONFIG_MLIB 0
@@ -215,6 +223,7 @@
#define CONFIG_AVS_DECODER 0
#define CONFIG_BETHSOFTVID_DECODER 0
#define CONFIG_BFI_DECODER 0
+#define CONFIG_BINK_DECODER 0
#define CONFIG_BMP_DECODER 0
#define CONFIG_C93_DECODER 0
#define CONFIG_CAVS_DECODER 0
@@ -253,10 +262,14 @@
#define CONFIG_H264_VDPAU_DECODER 0
#define CONFIG_HUFFYUV_DECODER 0
#define CONFIG_IDCIN_DECODER 0
+#define CONFIG_IFF_BYTERUN1_DECODER 0
+#define CONFIG_IFF_ILBM_DECODER 0
#define CONFIG_INDEO2_DECODER 0
#define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO5_DECODER 0
#define CONFIG_INTERPLAY_VIDEO_DECODER 0
#define CONFIG_JPEGLS_DECODER 0
+#define CONFIG_KGV1_DECODER 0
#define CONFIG_KMVC_DECODER 0
#define CONFIG_LOCO_DECODER 0
#define CONFIG_MDEC_DECODER 0
@@ -346,6 +359,7 @@
#define CONFIG_AC3_DECODER 0
#define CONFIG_ALAC_DECODER 0
#define CONFIG_ALS_DECODER 0
+#define CONFIG_AMRNB_DECODER 0
#define CONFIG_APE_DECODER 0
#define CONFIG_ATRAC1_DECODER 0
#define CONFIG_ATRAC3_DECODER 0
@@ -386,6 +400,7 @@
#define CONFIG_WMAPRO_DECODER 0
#define CONFIG_WMAV1_DECODER 0
#define CONFIG_WMAV2_DECODER 0
+#define CONFIG_WMAVOICE_DECODER 0
#define CONFIG_WS_SND1_DECODER 0
#define CONFIG_PCM_ALAW_DECODER 0
#define CONFIG_PCM_BLURAY_DECODER 0
@@ -811,6 +826,7 @@
#define CONFIG_RM_MUXER 0
#define CONFIG_ROQ_MUXER 0
#define CONFIG_RTP_MUXER 0
+#define CONFIG_RTSP_MUXER 0
#define CONFIG_SOX_MUXER 0
#define CONFIG_SPDIF_MUXER 0
#define CONFIG_SWF_MUXER 0
@@ -839,6 +855,7 @@
#define CONFIG_RTP_PROTOCOL 0
#define CONFIG_TCP_PROTOCOL 0
#define CONFIG_UDP_PROTOCOL 0
+#define CONFIG_CONCAT_PROTOCOL 0
#define CONFIG_ALSA_INDEV 0
#define CONFIG_AUDIO_BEOS_INDEV 0
#define CONFIG_BKTR_INDEV 0
« no previous file with comments | « third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698