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

Unified Diff: source/config/Chromium/mac/ia32/config.h

Issue 2813036: ffmpeg config files for june 23 version (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 6 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: source/config/Chromium/mac/ia32/config.h
===================================================================
--- source/config/Chromium/mac/ia32/config.h (revision 50820)
+++ source/config/Chromium/mac/ia32/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-decoders --disable-protocols --disable-parsers --disable-avfilter --disable-avdevice --disable-ffmpeg --disable-ffplay --disable-ffprobe --enable-shared --disable-static --disable-debug --disable-network --disable-gpl --disable-bzlib --disable-zlib --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --prefix=./chromium-ffmpeg --enable-libvpx --enable-decoder=libvpx --enable-demuxer=matroska"
+#define FFMPEG_CONFIGURATION "--disable-everything --disable-decoders --disable-protocols --disable-parsers --disable-avfilter --disable-avdevice --disable-ffmpeg --disable-ffplay --disable-ffprobe --enable-shared --disable-static --disable-debug --disable-network --disable-gpl --disable-bzlib --disable-zlib --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --enable-pthreads --enable-yasm --arch=i686 --extra-cflags=-m32 --extra-ldflags='-m32 -L../../libvpx/mac32/usr/local/lib' --prefix=./chromium-ffmpeg --enable-libvpx --enable-decoder=libvpx --enable-demuxer=matroska"
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
#define FFMPEG_DATADIR "./chromium-ffmpeg/share/ffmpeg"
#define CC_TYPE "gcc"
@@ -123,6 +123,9 @@
#define HAVE_STRUCT_SOCKADDR_IN6 0
#define HAVE_STRUCT_SOCKADDR_SA_LEN 0
#define HAVE_STRUCT_SOCKADDR_STORAGE 0
+#define HAVE_SYMVER 0
+#define HAVE_SYMVER_GNU_ASM 0
+#define HAVE_SYMVER_ASM_LABEL 0
#define HAVE_SYS_MMAN_H 1
#define HAVE_SYS_RESOURCE_H 1
#define HAVE_SYS_SELECT_H 1
@@ -175,8 +178,6 @@
#define CONFIG_LIBDC1394 0
#define CONFIG_LIBDIRAC 0
#define CONFIG_LIBFAAC 0
-#define CONFIG_LIBFAAD 0
-#define CONFIG_LIBFAADBIN 0
#define CONFIG_LIBGSM 0
#define CONFIG_LIBMP3LAME 0
#define CONFIG_LIBNUT 0
@@ -476,7 +477,6 @@
#define CONFIG_PGSSUB_DECODER 0
#define CONFIG_XSUB_DECODER 0
#define CONFIG_LIBDIRAC_DECODER 0
-#define CONFIG_LIBFAAD_DECODER 0
#define CONFIG_LIBGSM_DECODER 0
#define CONFIG_LIBGSM_MS_DECODER 0
#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
@@ -590,6 +590,7 @@
#define CONFIG_H263_VAAPI_HWACCEL 0
#define CONFIG_H264_DXVA2_HWACCEL 0
#define CONFIG_H264_VAAPI_HWACCEL 0
+#define CONFIG_MPEG2_DXVA2_HWACCEL 0
#define CONFIG_MPEG2_VAAPI_HWACCEL 0
#define CONFIG_MPEG4_VAAPI_HWACCEL 0
#define CONFIG_VC1_DXVA2_HWACCEL 0

Powered by Google App Engine
This is Rietveld 408576698