diff options
| -rw-r--r-- | build/all.gyp | 4 | ||||
| -rw-r--r-- | build/common.gypi | 18 | ||||
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 93 | ||||
| -rw-r--r-- | third_party/ffmpeg/source/config/Chromium/linux/arm/config.h | 811 | ||||
| -rw-r--r-- | third_party/ffmpeg/source/config/Chromium/linux/arm/version.h | 1 | ||||
| -rw-r--r-- | third_party/yasm/yasm.gyp | 10 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 2 |
7 files changed, 905 insertions, 34 deletions
diff --git a/build/all.gyp b/build/all.gyp index f19cc9f..81ae757 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -58,8 +58,8 @@ }], ['OS=="mac" or OS=="linux" or OS=="freebsd"', { 'dependencies': [ - '../third_party/yasm/yasm.gyp:*', - ], + '../third_party/yasm/yasm.gyp:*#host', + ], }], ['OS=="mac"', { 'dependencies': [ diff --git a/build/common.gypi b/build/common.gypi index 36a218a..34f9f25 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -672,13 +672,17 @@ ], }], ['target_arch=="arm"', { - 'target_conditions': [ - ['armv7==1 and _toolset=="target"', { - 'cflags': [ - '-march=armv7-a', - '-mtune=cortex-a8', - '-mfpu=neon', - '-mfloat-abi=softfp', + 'conditions': [ + ['armv7==1', { + 'target_conditions': [ + ['_toolset=="target"', { + 'cflags': [ + '-march=armv7-a', + '-mtune=cortex-a8', + '-mfpu=neon', + '-mfloat-abi=softfp', + ], + }], ], }], ], diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index e490ca6..9a2eb1e 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -49,15 +49,20 @@ 'variables': { 'target_for_binaries': 'ffmpegsumo_nolink', 'ffmpeg_include_root': 'source/patched-ffmpeg-mt', + 'conditions': [ + ['target_arch=="x64" or target_arch=="ia32"', { + 'ffmpeg_asm_lib': 1, + }], + ['target_arch=="arm"', { + 'ffmpeg_asm_lib': 0, + }], + ], }, 'targets': [ { 'target_name': 'ffmpegsumo', 'product_name': 'libffmpegsumo', 'type': 'shared_library', - 'dependencies': [ - 'make_ffmpeg_asm_lib', - ], 'sources': [ 'source/patched-ffmpeg-mt/libavcodec/aac.c', 'source/patched-ffmpeg-mt/libavcodec/aac_ac3_parser.c', @@ -103,20 +108,6 @@ 'source/patched-ffmpeg-mt/libavcodec/vorbis_dec.c', 'source/patched-ffmpeg-mt/libavcodec/vp3.c', 'source/patched-ffmpeg-mt/libavcodec/vp3dsp.c', - 'source/patched-ffmpeg-mt/libavcodec/x86/cpuid.c', - 'source/patched-ffmpeg-mt/libavcodec/x86/dnxhd_mmx.c', - 'source/patched-ffmpeg-mt/libavcodec/x86/dsputil_mmx.c', - 'source/patched-ffmpeg-mt/libavcodec/x86/fdct_mmx.c', - 'source/patched-ffmpeg-mt/libavcodec/x86/fft_3dn.c', - 'source/patched-ffmpeg-mt/libavcodec/x86/fft_3dn2.c', - 'source/patched-ffmpeg-mt/libavcodec/x86/fft_sse.c', - 'source/patched-ffmpeg-mt/libavcodec/x86/idct_mmx_xvid.c', - 'source/patched-ffmpeg-mt/libavcodec/x86/idct_sse2_xvid.c', - 'source/patched-ffmpeg-mt/libavcodec/x86/motion_est_mmx.c', - 'source/patched-ffmpeg-mt/libavcodec/x86/mpegvideo_mmx.c', - 'source/patched-ffmpeg-mt/libavcodec/x86/simple_idct_mmx.c', - 'source/patched-ffmpeg-mt/libavcodec/x86/vp3dsp_mmx.c', - 'source/patched-ffmpeg-mt/libavcodec/x86/vp3dsp_sse2.c', 'source/patched-ffmpeg-mt/libavcodec/xiph.c', 'source/patched-ffmpeg-mt/libavformat/allformats.c', 'source/patched-ffmpeg-mt/libavformat/avio.c', @@ -188,6 +179,27 @@ 'source/patched-ffmpeg-mt/libavformat/mp3.c', ], }], # ffmpeg_branding + ['target_arch=="ia32" or target_arch=="x64"', { + 'dependencies': [ + 'make_ffmpeg_asm_lib', + ], + 'sources': [ + 'source/patched-ffmpeg-mt/libavcodec/x86/cpuid.c', + 'source/patched-ffmpeg-mt/libavcodec/x86/dnxhd_mmx.c', + 'source/patched-ffmpeg-mt/libavcodec/x86/dsputil_mmx.c', + 'source/patched-ffmpeg-mt/libavcodec/x86/fdct_mmx.c', + 'source/patched-ffmpeg-mt/libavcodec/x86/fft_3dn.c', + 'source/patched-ffmpeg-mt/libavcodec/x86/fft_3dn2.c', + 'source/patched-ffmpeg-mt/libavcodec/x86/fft_sse.c', + 'source/patched-ffmpeg-mt/libavcodec/x86/idct_mmx_xvid.c', + 'source/patched-ffmpeg-mt/libavcodec/x86/idct_sse2_xvid.c', + 'source/patched-ffmpeg-mt/libavcodec/x86/motion_est_mmx.c', + 'source/patched-ffmpeg-mt/libavcodec/x86/mpegvideo_mmx.c', + 'source/patched-ffmpeg-mt/libavcodec/x86/simple_idct_mmx.c', + 'source/patched-ffmpeg-mt/libavcodec/x86/vp3dsp_mmx.c', + 'source/patched-ffmpeg-mt/libavcodec/x86/vp3dsp_sse2.c', + ], + }], ['target_arch=="x64"', { # x64 requires PIC for shared libraries. This is opposite # of ia32 where due to a slew of inline assembly using ebx, @@ -198,7 +210,30 @@ 'cflags': [ '-fPIC', ], - }], # target_arch + }], # target_arch=="x64" + ['target_arch=="arm"', { + 'defines': [ + 'PIC', + ], + 'cflags': [ + '-fPIC', + '-march=armv7-a', + '-mtune=cortex-a8', + '-mfpu=neon', + '-mfloat-abi=softfp', + ], + 'sources': [ + 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_arm.c', + 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_arm_s.S', + 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_vfp.S', + 'source/patched-ffmpeg-mt/libavcodec/arm/float_arm_vfp.c', + 'source/patched-ffmpeg-mt/libavcodec/arm/jrevdct_arm.S', + 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_arm.S', + 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv5te.S', + 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv6.S', + 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_neon.S', + ], + }], # target_arch=="arm" ['OS=="linux" or OS=="freebsd"', { 'defines': [ '_ISOC99_SOURCE', @@ -222,13 +257,18 @@ '-L<(shared_generated_dir)', ], 'libraries': [ - # TODO(ajwong): When scons is dead, collapse this with the - # absolute path entry inside the OS="mac" conditional, and - # move it out of the conditionals block altogether. - '-l<(asm_library)', - '-lz', ], + 'conditions': [ + ['ffmpeg_asm_lib==1', { + 'libraries': [ + # TODO(ajwong): When scons is dead, collapse this with the + # absolute path entry inside the OS="mac" conditional, and + # move it out of the conditionals block altogether. + '-l<(asm_library)', + ], + }], + ], }, }], # OS=="linux" or OS=="freebsd" ['OS=="mac"', { @@ -293,7 +333,7 @@ 'target_name': 'assemble_ffmpeg_asm', 'type': 'none', 'dependencies': [ - '../yasm/yasm.gyp:yasm', + '../yasm/yasm.gyp:yasm#host', ], 'sources': [ # The FFmpeg yasm files. @@ -325,6 +365,11 @@ ], }, }], + ['target_arch=="arm"', { + 'variables': { + 'yasm_flags': [], + }, + }], ], }], ['OS=="mac"', { 'variables': { diff --git a/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h b/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h new file mode 100644 index 0000000..8f0a08a --- /dev/null +++ b/third_party/ffmpeg/source/config/Chromium/linux/arm/config.h @@ -0,0 +1,811 @@ +/* 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 --enable-pthreads --disable-network --disable-encoders --disable-decoders --disable-hwaccels --disable-muxers --disable-demuxers --disable-parsers --disable-bsfs --disable-protocols --disable-devices --disable-filters --enable-decoder=theora --enable-decoder=vorbis --enable-demuxer=ogg --prefix=/tmp/dummy --enable-cross-compile --arch=arm --enable-armv6t2 --extra-cflags='-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp'" +#define FFMPEG_DATADIR "/tmp/dummy/share/ffmpeg" +#define CC_TYPE "gcc" +#define CC_VERSION __VERSION__ +#define restrict restrict +#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\n\t" +#define EXTERN_PREFIX "" +#define EXTERN_ASM +#define ARCH_ALPHA 0 +#define ARCH_ARM 1 +#define ARCH_AVR32 0 +#define ARCH_AVR32_AP 0 +#define ARCH_AVR32_UC 0 +#define ARCH_BFIN 0 +#define ARCH_IA64 0 +#define ARCH_M68K 0 +#define ARCH_MIPS 0 +#define ARCH_MIPS64 0 +#define ARCH_PARISC 0 +#define ARCH_PPC 0 +#define ARCH_PPC64 0 +#define ARCH_S390 0 +#define ARCH_SH4 0 +#define ARCH_SPARC 0 +#define ARCH_SPARC64 0 +#define ARCH_X86 0 +#define ARCH_X86_32 0 +#define ARCH_X86_64 0 +#define HAVE_ALTIVEC 0 +#define HAVE_AMD3DNOW 0 +#define HAVE_AMD3DNOWEXT 0 +#define HAVE_ARMV5TE 1 +#define HAVE_ARMV6 1 +#define HAVE_ARMV6T2 1 +#define HAVE_ARMVFP 1 +#define HAVE_IWMMXT 0 +#define HAVE_MMI 0 +#define HAVE_MMX 0 +#define HAVE_MMX2 0 +#define HAVE_NEON 0 +#define HAVE_PPC4XX 0 +#define HAVE_SSE 0 +#define HAVE_SSSE3 0 +#define HAVE_VIS 0 +#define HAVE_BEOSTHREADS 0 +#define HAVE_OS2THREADS 0 +#define HAVE_PTHREADS 1 +#define HAVE_W32THREADS 0 +#define HAVE_ALSA_ASOUNDLIB_H 0 +#define HAVE_ALTIVEC_H 0 +#define HAVE_ARPA_INET_H 0 +#define HAVE_ATTRIBUTE_PACKED 1 +#define HAVE_BIGENDIAN 0 +#define HAVE_BSWAP 0 +#define HAVE_CLOSESOCKET 0 +#define HAVE_CMOV 0 +#define HAVE_CONIO_H 0 +#define HAVE_DCBZL 0 +#define HAVE_DEV_BKTR_IOCTL_BT848_H 0 +#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 +#define HAVE_DEV_IC_BT8XX_H 0 +#define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0 +#define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0 +#define HAVE_DLFCN_H 1 +#define HAVE_DLOPEN 1 +#define HAVE_DOS_PATHS 0 +#define HAVE_EBP_AVAILABLE 0 +#define HAVE_EBX_AVAILABLE 0 +#define HAVE_FAST_64BIT 0 +#define HAVE_FAST_CMOV 0 +#define HAVE_FAST_UNALIGNED 0 +#define HAVE_FORK 1 +#define HAVE_GETHRTIME 0 +#define HAVE_GETPROCESSTIMES 0 +#define HAVE_GETRUSAGE 1 +#define HAVE_INET_ATON 1 +#define HAVE_INLINE_ASM 1 +#define HAVE_ISATTY 1 +#define HAVE_LDBRX 0 +#define HAVE_LIBDC1394_1 0 +#define HAVE_LIBDC1394_2 0 +#define HAVE_LLRINT 1 +#define HAVE_LOG2 1 +#define HAVE_LOONGSON 0 +#define HAVE_LRINT 1 +#define HAVE_LRINTF 1 +#define HAVE_LZO1X_999_COMPRESS 0 +#define HAVE_MACHINE_IOCTL_BT848_H 0 +#define HAVE_MACHINE_IOCTL_METEOR_H 0 +#define HAVE_MALLOC_H 1 +#define HAVE_MEMALIGN 1 +#define HAVE_MKSTEMP 1 +#define HAVE_PLD 1 +#define HAVE_POSIX_MEMALIGN 1 +#define HAVE_ROUND 1 +#define HAVE_ROUNDF 1 +#define HAVE_SDL 0 +#define HAVE_SDL_VIDEO_SIZE 0 +#define HAVE_SETMODE 0 +#define HAVE_SOCKLEN_T 0 +#define HAVE_SOUNDCARD_H 0 +#define HAVE_POLL_H 1 +#define HAVE_SYS_MMAN_H 1 +#define HAVE_SYS_RESOURCE_H 1 +#define HAVE_SYS_SELECT_H 1 +#define HAVE_SYS_SOUNDCARD_H 1 +#define HAVE_SYS_VIDEOIO_H 0 +#define HAVE_TEN_OPERANDS 0 +#define HAVE_TERMIOS_H 1 +#define HAVE_THREADS 1 +#define HAVE_TRUNCF 1 +#define HAVE_VFP_ARGS 0 +#define HAVE_VIRTUALALLOC 0 +#define HAVE_WINSOCK2_H 0 +#define HAVE_XFORM_ASM 0 +#define HAVE_YASM 0 +#define CONFIG_BSFS 0 +#define CONFIG_DECODERS 1 +#define CONFIG_DEMUXERS 1 +#define CONFIG_ENCODERS 0 +#define CONFIG_FILTERS 0 +#define CONFIG_HWACCELS 0 +#define CONFIG_INDEVS 0 +#define CONFIG_MUXERS 0 +#define CONFIG_OUTDEVS 0 +#define CONFIG_PARSERS 0 +#define CONFIG_PROTOCOLS 1 +#define CONFIG_AANDCT 0 +#define CONFIG_AVFILTER 0 +#define CONFIG_AVFILTER_LAVF 0 +#define CONFIG_AVISYNTH 0 +#define CONFIG_BEOS_NETSERVER 0 +#define CONFIG_BZLIB 0 +#define CONFIG_FASTDIV 1 +#define CONFIG_FFMPEG 0 +#define CONFIG_FFPLAY 0 +#define CONFIG_FFSERVER 0 +#define CONFIG_FFT 1 +#define CONFIG_GOLOMB 0 +#define CONFIG_GPL 0 +#define CONFIG_GPROF 0 +#define CONFIG_GRAY 0 +#define CONFIG_HARDCODED_TABLES 0 +#define CONFIG_IPV6 0 +#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 +#define CONFIG_LIBOPENCORE_AMRNB 0 +#define CONFIG_LIBOPENCORE_AMRWB 0 +#define CONFIG_LIBOPENJPEG 0 +#define CONFIG_LIBSCHROEDINGER 0 +#define CONFIG_LIBSPEEX 0 +#define CONFIG_LIBTHEORA 0 +#define CONFIG_LIBVORBIS 0 +#define CONFIG_LIBX264 0 +#define CONFIG_LIBXVID 0 +#define CONFIG_LPC 0 +#define CONFIG_MDCT 1 +#define CONFIG_MEMALIGN_HACK 0 +#define CONFIG_MLIB 0 +#define CONFIG_MPEGAUDIO_HP 1 +#define CONFIG_NETWORK 0 +#define CONFIG_NONFREE 0 +#define CONFIG_PIC 1 +#define CONFIG_POSTPROC 0 +#define CONFIG_POWERPC_PERF 0 +#define CONFIG_RDFT 0 +#define CONFIG_RUNTIME_CPUDETECT 0 +#define CONFIG_SHARED 1 +#define CONFIG_SMALL 0 +#define CONFIG_STATIC 0 +#define CONFIG_SWSCALE_ALPHA 1 +#define CONFIG_VAAPI 0 +#define CONFIG_VDPAU 0 +#define CONFIG_VERSION3 0 +#define CONFIG_X11GRAB 0 +#define CONFIG_ZLIB 0 +#define CONFIG_GPLV3 0 +#define CONFIG_LGPLV3 0 +#define CONFIG_AASC_DECODER 0 +#define CONFIG_AMV_DECODER 0 +#define CONFIG_ASV1_DECODER 0 +#define CONFIG_ASV2_DECODER 0 +#define CONFIG_AVS_DECODER 0 +#define CONFIG_BETHSOFTVID_DECODER 0 +#define CONFIG_BFI_DECODER 0 +#define CONFIG_BMP_DECODER 0 +#define CONFIG_C93_DECODER 0 +#define CONFIG_CAVS_DECODER 0 +#define CONFIG_CINEPAK_DECODER 0 +#define CONFIG_CLJR_DECODER 0 +#define CONFIG_CSCD_DECODER 0 +#define CONFIG_CYUV_DECODER 0 +#define CONFIG_DNXHD_DECODER 0 +#define CONFIG_DPX_DECODER 0 +#define CONFIG_DSICINVIDEO_DECODER 0 +#define CONFIG_DVVIDEO_DECODER 0 +#define CONFIG_DXA_DECODER 0 +#define CONFIG_EACMV_DECODER 0 +#define CONFIG_EAMAD_DECODER 0 +#define CONFIG_EATGQ_DECODER 0 +#define CONFIG_EATGV_DECODER 0 +#define CONFIG_EATQI_DECODER 0 +#define CONFIG_EIGHTBPS_DECODER 0 +#define CONFIG_EIGHTSVX_EXP_DECODER 0 +#define CONFIG_EIGHTSVX_FIB_DECODER 0 +#define CONFIG_ESCAPE124_DECODER 0 +#define CONFIG_FFV1_DECODER 0 +#define CONFIG_FFVHUFF_DECODER 0 +#define CONFIG_FLASHSV_DECODER 0 +#define CONFIG_FLIC_DECODER 0 +#define CONFIG_FLV_DECODER 0 +#define CONFIG_FOURXM_DECODER 0 +#define CONFIG_FRAPS_DECODER 0 +#define CONFIG_FRWU_DECODER 0 +#define CONFIG_GIF_DECODER 0 +#define CONFIG_H261_DECODER 0 +#define CONFIG_H263_DECODER 0 +#define CONFIG_H263I_DECODER 0 +#define CONFIG_H264_DECODER 0 +#define CONFIG_H264_VDPAU_DECODER 0 +#define CONFIG_HUFFYUV_DECODER 0 +#define CONFIG_IDCIN_DECODER 0 +#define CONFIG_INDEO2_DECODER 0 +#define CONFIG_INDEO3_DECODER 0 +#define CONFIG_INTERPLAY_VIDEO_DECODER 0 +#define CONFIG_JPEGLS_DECODER 0 +#define CONFIG_KMVC_DECODER 0 +#define CONFIG_LOCO_DECODER 0 +#define CONFIG_MDEC_DECODER 0 +#define CONFIG_MIMIC_DECODER 0 +#define CONFIG_MJPEG_DECODER 0 +#define CONFIG_MJPEGB_DECODER 0 +#define CONFIG_MMVIDEO_DECODER 0 +#define CONFIG_MOTIONPIXELS_DECODER 0 +#define CONFIG_MPEG_XVMC_DECODER 0 +#define CONFIG_MPEG1VIDEO_DECODER 0 +#define CONFIG_MPEG2VIDEO_DECODER 0 +#define CONFIG_MPEG4_DECODER 0 +#define CONFIG_MPEGVIDEO_DECODER 0 +#define CONFIG_MPEG_VDPAU_DECODER 0 +#define CONFIG_MPEG1_VDPAU_DECODER 0 +#define CONFIG_MSMPEG4V1_DECODER 0 +#define CONFIG_MSMPEG4V2_DECODER 0 +#define CONFIG_MSMPEG4V3_DECODER 0 +#define CONFIG_MSRLE_DECODER 0 +#define CONFIG_MSVIDEO1_DECODER 0 +#define CONFIG_MSZH_DECODER 0 +#define CONFIG_NUV_DECODER 0 +#define CONFIG_PAM_DECODER 0 +#define CONFIG_PBM_DECODER 0 +#define CONFIG_PCX_DECODER 0 +#define CONFIG_PGM_DECODER 0 +#define CONFIG_PGMYUV_DECODER 0 +#define CONFIG_PNG_DECODER 0 +#define CONFIG_PPM_DECODER 0 +#define CONFIG_PTX_DECODER 0 +#define CONFIG_QDRAW_DECODER 0 +#define CONFIG_QPEG_DECODER 0 +#define CONFIG_QTRLE_DECODER 0 +#define CONFIG_RAWVIDEO_DECODER 0 +#define CONFIG_RL2_DECODER 0 +#define CONFIG_ROQ_DECODER 0 +#define CONFIG_RPZA_DECODER 0 +#define CONFIG_RV10_DECODER 0 +#define CONFIG_RV20_DECODER 0 +#define CONFIG_RV30_DECODER 0 +#define CONFIG_RV40_DECODER 0 +#define CONFIG_SGI_DECODER 0 +#define CONFIG_SMACKER_DECODER 0 +#define CONFIG_SMC_DECODER 0 +#define CONFIG_SNOW_DECODER 0 +#define CONFIG_SP5X_DECODER 0 +#define CONFIG_SUNRAST_DECODER 0 +#define CONFIG_SVQ1_DECODER 0 +#define CONFIG_SVQ3_DECODER 0 +#define CONFIG_TARGA_DECODER 0 +#define CONFIG_THEORA_DECODER 1 +#define CONFIG_THP_DECODER 0 +#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 +#define CONFIG_TIFF_DECODER 0 +#define CONFIG_TMV_DECODER 0 +#define CONFIG_TRUEMOTION1_DECODER 0 +#define CONFIG_TRUEMOTION2_DECODER 0 +#define CONFIG_TSCC_DECODER 0 +#define CONFIG_TXD_DECODER 0 +#define CONFIG_ULTI_DECODER 0 +#define CONFIG_V210_DECODER 0 +#define CONFIG_V210X_DECODER 0 +#define CONFIG_VB_DECODER 0 +#define CONFIG_VC1_DECODER 0 +#define CONFIG_VC1_VDPAU_DECODER 0 +#define CONFIG_VCR1_DECODER 0 +#define CONFIG_VMDVIDEO_DECODER 0 +#define CONFIG_VMNC_DECODER 0 +#define CONFIG_VP3_DECODER 1 +#define CONFIG_VP5_DECODER 0 +#define CONFIG_VP6_DECODER 0 +#define CONFIG_VP6A_DECODER 0 +#define CONFIG_VP6F_DECODER 0 +#define CONFIG_VQA_DECODER 0 +#define CONFIG_WMV1_DECODER 0 +#define CONFIG_WMV2_DECODER 0 +#define CONFIG_WMV3_DECODER 0 +#define CONFIG_WMV3_VDPAU_DECODER 0 +#define CONFIG_WNV1_DECODER 0 +#define CONFIG_XAN_WC3_DECODER 0 +#define CONFIG_XL_DECODER 0 +#define CONFIG_ZLIB_DECODER 0 +#define CONFIG_ZMBV_DECODER 0 +#define CONFIG_AAC_DECODER 0 +#define CONFIG_AC3_DECODER 0 +#define CONFIG_ALAC_DECODER 0 +#define CONFIG_APE_DECODER 0 +#define CONFIG_ATRAC1_DECODER 0 +#define CONFIG_ATRAC3_DECODER 0 +#define CONFIG_COOK_DECODER 0 +#define CONFIG_DCA_DECODER 0 +#define CONFIG_DSICINAUDIO_DECODER 0 +#define CONFIG_EAC3_DECODER 0 +#define CONFIG_FLAC_DECODER 0 +#define CONFIG_IMC_DECODER 0 +#define CONFIG_MACE3_DECODER 0 +#define CONFIG_MACE6_DECODER 0 +#define CONFIG_MLP_DECODER 0 +#define CONFIG_MP1_DECODER 0 +#define CONFIG_MP2_DECODER 0 +#define CONFIG_MP3_DECODER 0 +#define CONFIG_MP3ADU_DECODER 0 +#define CONFIG_MP3ON4_DECODER 0 +#define CONFIG_MPC7_DECODER 0 +#define CONFIG_MPC8_DECODER 0 +#define CONFIG_NELLYMOSER_DECODER 0 +#define CONFIG_QCELP_DECODER 0 +#define CONFIG_QDM2_DECODER 0 +#define CONFIG_RA_144_DECODER 0 +#define CONFIG_RA_288_DECODER 0 +#define CONFIG_SHORTEN_DECODER 0 +#define CONFIG_SMACKAUD_DECODER 0 +#define CONFIG_SONIC_DECODER 0 +#define CONFIG_TRUEHD_DECODER 0 +#define CONFIG_TRUESPEECH_DECODER 0 +#define CONFIG_TTA_DECODER 0 +#define CONFIG_TWINVQ_DECODER 0 +#define CONFIG_VMDAUDIO_DECODER 0 +#define CONFIG_VORBIS_DECODER 1 +#define CONFIG_WAVPACK_DECODER 0 +#define CONFIG_WMAPRO_DECODER 0 +#define CONFIG_WMAV1_DECODER 0 +#define CONFIG_WMAV2_DECODER 0 +#define CONFIG_WS_SND1_DECODER 0 +#define CONFIG_PCM_ALAW_DECODER 0 +#define CONFIG_PCM_BLURAY_DECODER 0 +#define CONFIG_PCM_DVD_DECODER 0 +#define CONFIG_PCM_F32BE_DECODER 0 +#define CONFIG_PCM_F32LE_DECODER 0 +#define CONFIG_PCM_F64BE_DECODER 0 +#define CONFIG_PCM_F64LE_DECODER 0 +#define CONFIG_PCM_MULAW_DECODER 0 +#define CONFIG_PCM_S8_DECODER 0 +#define CONFIG_PCM_S16BE_DECODER 0 +#define CONFIG_PCM_S16LE_DECODER 0 +#define CONFIG_PCM_S16LE_PLANAR_DECODER 0 +#define CONFIG_PCM_S24BE_DECODER 0 +#define CONFIG_PCM_S24DAUD_DECODER 0 +#define CONFIG_PCM_S24LE_DECODER 0 +#define CONFIG_PCM_S32BE_DECODER 0 +#define CONFIG_PCM_S32LE_DECODER 0 +#define CONFIG_PCM_U8_DECODER 0 +#define CONFIG_PCM_U16BE_DECODER 0 +#define CONFIG_PCM_U16LE_DECODER 0 +#define CONFIG_PCM_U24BE_DECODER 0 +#define CONFIG_PCM_U24LE_DECODER 0 +#define CONFIG_PCM_U32BE_DECODER 0 +#define CONFIG_PCM_U32LE_DECODER 0 +#define CONFIG_PCM_ZORK_DECODER 0 +#define CONFIG_INTERPLAY_DPCM_DECODER 0 +#define CONFIG_ROQ_DPCM_DECODER 0 +#define CONFIG_SOL_DPCM_DECODER 0 +#define CONFIG_XAN_DPCM_DECODER 0 +#define CONFIG_ADPCM_4XM_DECODER 0 +#define CONFIG_ADPCM_ADX_DECODER 0 +#define CONFIG_ADPCM_CT_DECODER 0 +#define CONFIG_ADPCM_EA_DECODER 0 +#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0 +#define CONFIG_ADPCM_EA_R1_DECODER 0 +#define CONFIG_ADPCM_EA_R2_DECODER 0 +#define CONFIG_ADPCM_EA_R3_DECODER 0 +#define CONFIG_ADPCM_EA_XAS_DECODER 0 +#define CONFIG_ADPCM_G726_DECODER 0 +#define CONFIG_ADPCM_IMA_AMV_DECODER 0 +#define CONFIG_ADPCM_IMA_DK3_DECODER 0 +#define CONFIG_ADPCM_IMA_DK4_DECODER 0 +#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 +#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0 +#define CONFIG_ADPCM_IMA_ISS_DECODER 0 +#define CONFIG_ADPCM_IMA_QT_DECODER 0 +#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0 +#define CONFIG_ADPCM_IMA_WAV_DECODER 0 +#define CONFIG_ADPCM_IMA_WS_DECODER 0 +#define CONFIG_ADPCM_MS_DECODER 0 +#define CONFIG_ADPCM_SBPRO_2_DECODER 0 +#define CONFIG_ADPCM_SBPRO_3_DECODER 0 +#define CONFIG_ADPCM_SBPRO_4_DECODER 0 +#define CONFIG_ADPCM_SWF_DECODER 0 +#define CONFIG_ADPCM_THP_DECODER 0 +#define CONFIG_ADPCM_XA_DECODER 0 +#define CONFIG_ADPCM_YAMAHA_DECODER 0 +#define CONFIG_DVBSUB_DECODER 0 +#define CONFIG_DVDSUB_DECODER 0 +#define CONFIG_PGSSUB_DECODER 0 +#define CONFIG_XSUB_DECODER 0 +#define CONFIG_LIBAMR_NB_DECODER 0 +#define CONFIG_LIBAMR_WB_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 +#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 +#define CONFIG_LIBOPENJPEG_DECODER 0 +#define CONFIG_LIBSCHROEDINGER_DECODER 0 +#define CONFIG_LIBSPEEX_DECODER 0 +#define CONFIG_ASV1_ENCODER 0 +#define CONFIG_ASV2_ENCODER 0 +#define CONFIG_BMP_ENCODER 0 +#define CONFIG_DNXHD_ENCODER 0 +#define CONFIG_DVVIDEO_ENCODER 0 +#define CONFIG_FFV1_ENCODER 0 +#define CONFIG_FFVHUFF_ENCODER 0 +#define CONFIG_FLASHSV_ENCODER 0 +#define CONFIG_FLV_ENCODER 0 +#define CONFIG_GIF_ENCODER 0 +#define CONFIG_H261_ENCODER 0 +#define CONFIG_H263_ENCODER 0 +#define CONFIG_H263P_ENCODER 0 +#define CONFIG_HUFFYUV_ENCODER 0 +#define CONFIG_JPEGLS_ENCODER 0 +#define CONFIG_LJPEG_ENCODER 0 +#define CONFIG_MJPEG_ENCODER 0 +#define CONFIG_MPEG1VIDEO_ENCODER 0 +#define CONFIG_MPEG2VIDEO_ENCODER 0 +#define CONFIG_MPEG4_ENCODER 0 +#define CONFIG_MSMPEG4V1_ENCODER 0 +#define CONFIG_MSMPEG4V2_ENCODER 0 +#define CONFIG_MSMPEG4V3_ENCODER 0 +#define CONFIG_PAM_ENCODER 0 +#define CONFIG_PBM_ENCODER 0 +#define CONFIG_PCX_ENCODER 0 +#define CONFIG_PGM_ENCODER 0 +#define CONFIG_PGMYUV_ENCODER 0 +#define CONFIG_PNG_ENCODER 0 +#define CONFIG_PPM_ENCODER 0 +#define CONFIG_QTRLE_ENCODER 0 +#define CONFIG_RAWVIDEO_ENCODER 0 +#define CONFIG_ROQ_ENCODER 0 +#define CONFIG_RV10_ENCODER 0 +#define CONFIG_RV20_ENCODER 0 +#define CONFIG_SGI_ENCODER 0 +#define CONFIG_SNOW_ENCODER 0 +#define CONFIG_SVQ1_ENCODER 0 +#define CONFIG_TARGA_ENCODER 0 +#define CONFIG_TIFF_ENCODER 0 +#define CONFIG_V210_ENCODER 0 +#define CONFIG_WMV1_ENCODER 0 +#define CONFIG_WMV2_ENCODER 0 +#define CONFIG_ZLIB_ENCODER 0 +#define CONFIG_ZMBV_ENCODER 0 +#define CONFIG_AAC_ENCODER 0 +#define CONFIG_AC3_ENCODER 0 +#define CONFIG_ALAC_ENCODER 0 +#define CONFIG_FLAC_ENCODER 0 +#define CONFIG_MP2_ENCODER 0 +#define CONFIG_NELLYMOSER_ENCODER 0 +#define CONFIG_SONIC_ENCODER 0 +#define CONFIG_SONIC_LS_ENCODER 0 +#define CONFIG_VORBIS_ENCODER 0 +#define CONFIG_WMAV1_ENCODER 0 +#define CONFIG_WMAV2_ENCODER 0 +#define CONFIG_PCM_ALAW_ENCODER 0 +#define CONFIG_PCM_F32BE_ENCODER 0 +#define CONFIG_PCM_F32LE_ENCODER 0 +#define CONFIG_PCM_F64BE_ENCODER 0 +#define CONFIG_PCM_F64LE_ENCODER 0 +#define CONFIG_PCM_MULAW_ENCODER 0 +#define CONFIG_PCM_S8_ENCODER 0 +#define CONFIG_PCM_S16BE_ENCODER 0 +#define CONFIG_PCM_S16LE_ENCODER 0 +#define CONFIG_PCM_S24BE_ENCODER 0 +#define CONFIG_PCM_S24DAUD_ENCODER 0 +#define CONFIG_PCM_S24LE_ENCODER 0 +#define CONFIG_PCM_S32BE_ENCODER 0 +#define CONFIG_PCM_S32LE_ENCODER 0 +#define CONFIG_PCM_U8_ENCODER 0 +#define CONFIG_PCM_U16BE_ENCODER 0 +#define CONFIG_PCM_U16LE_ENCODER 0 +#define CONFIG_PCM_U24BE_ENCODER 0 +#define CONFIG_PCM_U24LE_ENCODER 0 +#define CONFIG_PCM_U32BE_ENCODER 0 +#define CONFIG_PCM_U32LE_ENCODER 0 +#define CONFIG_PCM_ZORK_ENCODER 0 +#define CONFIG_ROQ_DPCM_ENCODER 0 +#define CONFIG_ADPCM_ADX_ENCODER 0 +#define CONFIG_ADPCM_G726_ENCODER 0 +#define CONFIG_ADPCM_IMA_QT_ENCODER 0 +#define CONFIG_ADPCM_IMA_WAV_ENCODER 0 +#define CONFIG_ADPCM_MS_ENCODER 0 +#define CONFIG_ADPCM_SWF_ENCODER 0 +#define CONFIG_ADPCM_YAMAHA_ENCODER 0 +#define CONFIG_DVBSUB_ENCODER 0 +#define CONFIG_DVDSUB_ENCODER 0 +#define CONFIG_XSUB_ENCODER 0 +#define CONFIG_LIBAMR_NB_ENCODER 0 +#define CONFIG_LIBAMR_WB_ENCODER 0 +#define CONFIG_LIBDIRAC_ENCODER 0 +#define CONFIG_LIBFAAC_ENCODER 0 +#define CONFIG_LIBGSM_ENCODER 0 +#define CONFIG_LIBGSM_MS_ENCODER 0 +#define CONFIG_LIBMP3LAME_ENCODER 0 +#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 +#define CONFIG_LIBSCHROEDINGER_ENCODER 0 +#define CONFIG_LIBTHEORA_ENCODER 0 +#define CONFIG_LIBVORBIS_ENCODER 0 +#define CONFIG_LIBX264_ENCODER 0 +#define CONFIG_LIBXVID_ENCODER 0 +#define CONFIG_H263_VAAPI_HWACCEL 0 +#define CONFIG_MPEG2_VAAPI_HWACCEL 0 +#define CONFIG_MPEG4_VAAPI_HWACCEL 0 +#define CONFIG_VC1_VAAPI_HWACCEL 0 +#define CONFIG_WMV3_VAAPI_HWACCEL 0 +#define CONFIG_AAC_PARSER 0 +#define CONFIG_AC3_PARSER 0 +#define CONFIG_CAVSVIDEO_PARSER 0 +#define CONFIG_DCA_PARSER 0 +#define CONFIG_DIRAC_PARSER 0 +#define CONFIG_DNXHD_PARSER 0 +#define CONFIG_DVBSUB_PARSER 0 +#define CONFIG_DVDSUB_PARSER 0 +#define CONFIG_H261_PARSER 0 +#define CONFIG_H263_PARSER 0 +#define CONFIG_H264_PARSER 0 +#define CONFIG_MJPEG_PARSER 0 +#define CONFIG_MLP_PARSER 0 +#define CONFIG_MPEG4VIDEO_PARSER 0 +#define CONFIG_MPEGAUDIO_PARSER 0 +#define CONFIG_MPEGVIDEO_PARSER 0 +#define CONFIG_PNM_PARSER 0 +#define CONFIG_VC1_PARSER 0 +#define CONFIG_VP3_PARSER 0 +#define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_DUMP_EXTRADATA_BSF 0 +#define CONFIG_H264_MP4TOANNEXB_BSF 0 +#define CONFIG_MPEG4VIDEO_ES_BSF 0 +#define CONFIG_IMX_DUMP_HEADER_BSF 0 +#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 +#define CONFIG_MP3_HEADER_COMPRESS_BSF 0 +#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0 +#define CONFIG_MOV2TEXTSUB_BSF 0 +#define CONFIG_NOISE_BSF 0 +#define CONFIG_REMOVE_EXTRADATA_BSF 0 +#define CONFIG_TEXT2MOVSUB_BSF 0 +#define CONFIG_AAC_DEMUXER 0 +#define CONFIG_AC3_DEMUXER 0 +#define CONFIG_AEA_DEMUXER 0 +#define CONFIG_AIFF_DEMUXER 0 +#define CONFIG_AMR_DEMUXER 0 +#define CONFIG_APC_DEMUXER 0 +#define CONFIG_APE_DEMUXER 0 +#define CONFIG_ASF_DEMUXER 0 +#define CONFIG_ASS_DEMUXER 0 +#define CONFIG_AU_DEMUXER 0 +#define CONFIG_AVI_DEMUXER 0 +#define CONFIG_AVISYNTH_DEMUXER 0 +#define CONFIG_AVS_DEMUXER 0 +#define CONFIG_BETHSOFTVID_DEMUXER 0 +#define CONFIG_BFI_DEMUXER 0 +#define CONFIG_C93_DEMUXER 0 +#define CONFIG_CAF_DEMUXER 0 +#define CONFIG_CAVSVIDEO_DEMUXER 0 +#define CONFIG_DAUD_DEMUXER 0 +#define CONFIG_DIRAC_DEMUXER 0 +#define CONFIG_DNXHD_DEMUXER 0 +#define CONFIG_DSICIN_DEMUXER 0 +#define CONFIG_DTS_DEMUXER 0 +#define CONFIG_DV_DEMUXER 0 +#define CONFIG_DXA_DEMUXER 0 +#define CONFIG_EA_DEMUXER 0 +#define CONFIG_EA_CDATA_DEMUXER 0 +#define CONFIG_EAC3_DEMUXER 0 +#define CONFIG_FFM_DEMUXER 0 +#define CONFIG_FLAC_DEMUXER 0 +#define CONFIG_FLIC_DEMUXER 0 +#define CONFIG_FLV_DEMUXER 0 +#define CONFIG_FOURXM_DEMUXER 0 +#define CONFIG_GSM_DEMUXER 0 +#define CONFIG_GXF_DEMUXER 0 +#define CONFIG_H261_DEMUXER 0 +#define CONFIG_H263_DEMUXER 0 +#define CONFIG_H264_DEMUXER 0 +#define CONFIG_IDCIN_DEMUXER 0 +#define CONFIG_IFF_DEMUXER 0 +#define CONFIG_IMAGE2_DEMUXER 0 +#define CONFIG_IMAGE2PIPE_DEMUXER 0 +#define CONFIG_INGENIENT_DEMUXER 0 +#define CONFIG_IPMOVIE_DEMUXER 0 +#define CONFIG_ISS_DEMUXER 0 +#define CONFIG_LMLM4_DEMUXER 0 +#define CONFIG_M4V_DEMUXER 0 +#define CONFIG_MATROSKA_DEMUXER 0 +#define CONFIG_MJPEG_DEMUXER 0 +#define CONFIG_MLP_DEMUXER 0 +#define CONFIG_MM_DEMUXER 0 +#define CONFIG_MMF_DEMUXER 0 +#define CONFIG_MOV_DEMUXER 0 +#define CONFIG_MP3_DEMUXER 0 +#define CONFIG_MPC_DEMUXER 0 +#define CONFIG_MPC8_DEMUXER 0 +#define CONFIG_MPEGPS_DEMUXER 0 +#define CONFIG_MPEGTS_DEMUXER 0 +#define CONFIG_MPEGTSRAW_DEMUXER 0 +#define CONFIG_MPEGVIDEO_DEMUXER 0 +#define CONFIG_MSNWC_TCP_DEMUXER 0 +#define CONFIG_MTV_DEMUXER 0 +#define CONFIG_MVI_DEMUXER 0 +#define CONFIG_MXF_DEMUXER 0 +#define CONFIG_NC_DEMUXER 0 +#define CONFIG_NSV_DEMUXER 0 +#define CONFIG_NUT_DEMUXER 0 +#define CONFIG_NUV_DEMUXER 0 +#define CONFIG_OGG_DEMUXER 1 +#define CONFIG_OMA_DEMUXER 0 +#define CONFIG_PCM_ALAW_DEMUXER 0 +#define CONFIG_PCM_MULAW_DEMUXER 0 +#define CONFIG_PCM_F64BE_DEMUXER 0 +#define CONFIG_PCM_F64LE_DEMUXER 0 +#define CONFIG_PCM_F32BE_DEMUXER 0 +#define CONFIG_PCM_F32LE_DEMUXER 0 +#define CONFIG_PCM_S32BE_DEMUXER 0 +#define CONFIG_PCM_S32LE_DEMUXER 0 +#define CONFIG_PCM_S24BE_DEMUXER 0 +#define CONFIG_PCM_S24LE_DEMUXER 0 +#define CONFIG_PCM_S16BE_DEMUXER 0 +#define CONFIG_PCM_S16LE_DEMUXER 0 +#define CONFIG_PCM_S8_DEMUXER 0 +#define CONFIG_PCM_U32BE_DEMUXER 0 +#define CONFIG_PCM_U32LE_DEMUXER 0 +#define CONFIG_PCM_U24BE_DEMUXER 0 +#define CONFIG_PCM_U24LE_DEMUXER 0 +#define CONFIG_PCM_U16BE_DEMUXER 0 +#define CONFIG_PCM_U16LE_DEMUXER 0 +#define CONFIG_PCM_U8_DEMUXER 0 +#define CONFIG_PVA_DEMUXER 0 +#define CONFIG_QCP_DEMUXER 0 +#define CONFIG_R3D_DEMUXER 0 +#define CONFIG_RAWVIDEO_DEMUXER 0 +#define CONFIG_REDIR_DEMUXER 0 +#define CONFIG_RL2_DEMUXER 0 +#define CONFIG_RM_DEMUXER 0 +#define CONFIG_ROQ_DEMUXER 0 +#define CONFIG_RPL_DEMUXER 0 +#define CONFIG_RTSP_DEMUXER 0 +#define CONFIG_SDP_DEMUXER 0 +#define CONFIG_SEGAFILM_DEMUXER 0 +#define CONFIG_SHORTEN_DEMUXER 0 +#define CONFIG_SIFF_DEMUXER 0 +#define CONFIG_SMACKER_DEMUXER 0 +#define CONFIG_SOL_DEMUXER 0 +#define CONFIG_SOX_DEMUXER 0 +#define CONFIG_STR_DEMUXER 0 +#define CONFIG_SWF_DEMUXER 0 +#define CONFIG_THP_DEMUXER 0 +#define CONFIG_TIERTEXSEQ_DEMUXER 0 +#define CONFIG_TMV_DEMUXER 0 +#define CONFIG_TRUEHD_DEMUXER 0 +#define CONFIG_TTA_DEMUXER 0 +#define CONFIG_TXD_DEMUXER 0 +#define CONFIG_VC1_DEMUXER 0 +#define CONFIG_VC1T_DEMUXER 0 +#define CONFIG_VMD_DEMUXER 0 +#define CONFIG_VOC_DEMUXER 0 +#define CONFIG_VQF_DEMUXER 0 +#define CONFIG_W64_DEMUXER 0 +#define CONFIG_WAV_DEMUXER 0 +#define CONFIG_WC3_DEMUXER 0 +#define CONFIG_WSAUD_DEMUXER 0 +#define CONFIG_WSVQA_DEMUXER 0 +#define CONFIG_WV_DEMUXER 0 +#define CONFIG_XA_DEMUXER 0 +#define CONFIG_YUV4MPEGPIPE_DEMUXER 0 +#define CONFIG_LIBNUT_DEMUXER 0 +#define CONFIG_AC3_MUXER 0 +#define CONFIG_ADTS_MUXER 0 +#define CONFIG_AIFF_MUXER 0 +#define CONFIG_AMR_MUXER 0 +#define CONFIG_ASF_MUXER 0 +#define CONFIG_ASS_MUXER 0 +#define CONFIG_ASF_STREAM_MUXER 0 +#define CONFIG_AU_MUXER 0 +#define CONFIG_AVI_MUXER 0 +#define CONFIG_AVM2_MUXER 0 +#define CONFIG_CRC_MUXER 0 +#define CONFIG_DAUD_MUXER 0 +#define CONFIG_DIRAC_MUXER 0 +#define CONFIG_DNXHD_MUXER 0 +#define CONFIG_DTS_MUXER 0 +#define CONFIG_DV_MUXER 0 +#define CONFIG_EAC3_MUXER 0 +#define CONFIG_FFM_MUXER 0 +#define CONFIG_FLAC_MUXER 0 +#define CONFIG_FLV_MUXER 0 +#define CONFIG_FRAMECRC_MUXER 0 +#define CONFIG_GIF_MUXER 0 +#define CONFIG_GXF_MUXER 0 +#define CONFIG_H261_MUXER 0 +#define CONFIG_H263_MUXER 0 +#define CONFIG_H264_MUXER 0 +#define CONFIG_IMAGE2_MUXER 0 +#define CONFIG_IMAGE2PIPE_MUXER 0 +#define CONFIG_IPOD_MUXER 0 +#define CONFIG_M4V_MUXER 0 +#define CONFIG_MATROSKA_MUXER 0 +#define CONFIG_MATROSKA_AUDIO_MUXER 0 +#define CONFIG_MJPEG_MUXER 0 +#define CONFIG_MLP_MUXER 0 +#define CONFIG_MMF_MUXER 0 +#define CONFIG_MOV_MUXER 0 +#define CONFIG_MP2_MUXER 0 +#define CONFIG_MP3_MUXER 0 +#define CONFIG_MP4_MUXER 0 +#define CONFIG_MPEG1SYSTEM_MUXER 0 +#define CONFIG_MPEG1VCD_MUXER 0 +#define CONFIG_MPEG1VIDEO_MUXER 0 +#define CONFIG_MPEG2DVD_MUXER 0 +#define CONFIG_MPEG2SVCD_MUXER 0 +#define CONFIG_MPEG2VIDEO_MUXER 0 +#define CONFIG_MPEG2VOB_MUXER 0 +#define CONFIG_MPEGTS_MUXER 0 +#define CONFIG_MPJPEG_MUXER 0 +#define CONFIG_MXF_MUXER 0 +#define CONFIG_MXF_D10_MUXER 0 +#define CONFIG_NULL_MUXER 0 +#define CONFIG_NUT_MUXER 0 +#define CONFIG_OGG_MUXER 0 +#define CONFIG_PCM_ALAW_MUXER 0 +#define CONFIG_PCM_MULAW_MUXER 0 +#define CONFIG_PCM_F64BE_MUXER 0 +#define CONFIG_PCM_F64LE_MUXER 0 +#define CONFIG_PCM_F32BE_MUXER 0 +#define CONFIG_PCM_F32LE_MUXER 0 +#define CONFIG_PCM_S32BE_MUXER 0 +#define CONFIG_PCM_S32LE_MUXER 0 +#define CONFIG_PCM_S24BE_MUXER 0 +#define CONFIG_PCM_S24LE_MUXER 0 +#define CONFIG_PCM_S16BE_MUXER 0 +#define CONFIG_PCM_S16LE_MUXER 0 +#define CONFIG_PCM_S8_MUXER 0 +#define CONFIG_PCM_U32BE_MUXER 0 +#define CONFIG_PCM_U32LE_MUXER 0 +#define CONFIG_PCM_U24BE_MUXER 0 +#define CONFIG_PCM_U24LE_MUXER 0 +#define CONFIG_PCM_U16BE_MUXER 0 +#define CONFIG_PCM_U16LE_MUXER 0 +#define CONFIG_PCM_U8_MUXER 0 +#define CONFIG_PSP_MUXER 0 +#define CONFIG_RAWVIDEO_MUXER 0 +#define CONFIG_RM_MUXER 0 +#define CONFIG_ROQ_MUXER 0 +#define CONFIG_RTP_MUXER 0 +#define CONFIG_SOX_MUXER 0 +#define CONFIG_SPDIF_MUXER 0 +#define CONFIG_SWF_MUXER 0 +#define CONFIG_TG2_MUXER 0 +#define CONFIG_TGP_MUXER 0 +#define CONFIG_TRUEHD_MUXER 0 +#define CONFIG_VC1T_MUXER 0 +#define CONFIG_VOC_MUXER 0 +#define CONFIG_WAV_MUXER 0 +#define CONFIG_YUV4MPEGPIPE_MUXER 0 +#define CONFIG_LIBNUT_MUXER 0 +#define CONFIG_NULL_FILTER 0 +#define CONFIG_FILE_PROTOCOL 0 +#define CONFIG_GOPHER_PROTOCOL 0 +#define CONFIG_HTTP_PROTOCOL 0 +#define CONFIG_PIPE_PROTOCOL 0 +#define CONFIG_RTMP_PROTOCOL 0 +#define CONFIG_RTP_PROTOCOL 0 +#define CONFIG_TCP_PROTOCOL 0 +#define CONFIG_UDP_PROTOCOL 0 +#define CONFIG_ALSA_INDEV 0 +#define CONFIG_AUDIO_BEOS_INDEV 0 +#define CONFIG_BKTR_INDEV 0 +#define CONFIG_DV1394_INDEV 0 +#define CONFIG_JACK_INDEV 0 +#define CONFIG_OSS_INDEV 0 +#define CONFIG_V4L2_INDEV 0 +#define CONFIG_V4L_INDEV 0 +#define CONFIG_VFWCAP_INDEV 0 +#define CONFIG_X11_GRAB_DEVICE_INDEV 0 +#define CONFIG_LIBDC1394_INDEV 0 +#define CONFIG_ALSA_OUTDEV 0 +#define CONFIG_AUDIO_BEOS_OUTDEV 0 +#define CONFIG_OSS_OUTDEV 0 +#endif /* FFMPEG_CONFIG_H */ diff --git a/third_party/ffmpeg/source/config/Chromium/linux/arm/version.h b/third_party/ffmpeg/source/config/Chromium/linux/arm/version.h new file mode 100644 index 0000000..0cd599e --- /dev/null +++ b/third_party/ffmpeg/source/config/Chromium/linux/arm/version.h @@ -0,0 +1 @@ +#define FFMPEG_VERSION "SVN-r28636" diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp index cfd67ec..f53d1f6 100644 --- a/third_party/yasm/yasm.gyp +++ b/third_party/yasm/yasm.gyp @@ -60,6 +60,7 @@ { 'target_name': 'yasm', 'type': 'executable', + 'toolsets': ['host'], 'dependencies': [ 'config_sources', 'genmacro', @@ -337,6 +338,7 @@ { 'target_name': 'config_sources', 'type': 'none', + 'toolsets': ['host'], 'sources': [ 'source/config/<(OS)/Makefile', 'source/config/<(OS)/config.h', @@ -346,6 +348,7 @@ { 'target_name': 'generate_files', 'type': 'none', + 'toolsets': ['host'], 'dependencies': [ 'genperf', 'genversion', @@ -407,6 +410,7 @@ { 'target_name': 'genperf_libs', 'type': 'static_library', + 'toolsets': ['host'], 'dependencies': [ 'config_sources', ], 'sources': [ 'source/patched-yasm/libyasm/phash.c', @@ -424,6 +428,7 @@ { 'target_name': 'genstring', 'type': 'executable', + 'toolsets': ['host'], 'dependencies': [ 'config_sources', ], 'sources': [ 'source/patched-yasm/genstring.c', @@ -438,6 +443,7 @@ { 'target_name': 'genperf', 'type': 'executable', + 'toolsets': ['host'], 'dependencies': [ 'genperf_libs', ], @@ -455,6 +461,7 @@ { 'target_name': 'genmacro', 'type': 'executable', + 'toolsets': ['host'], 'dependencies': [ 'config_sources', ], 'sources': [ 'source/patched-yasm/tools/genmacro/genmacro.c', @@ -469,6 +476,7 @@ { 'target_name': 'genversion', 'type': 'executable', + 'toolsets': ['host'], 'dependencies': [ 'config_sources', ], 'sources': [ 'source/patched-yasm/modules/preprocs/nasm/genversion.c', @@ -483,6 +491,7 @@ { 'target_name': 're2c', 'type': 'executable', + 'toolsets': ['host'], 'dependencies': [ 'config_sources', ], 'sources': [ 'source/patched-yasm/tools/re2c/main.c', @@ -505,6 +514,7 @@ { 'target_name': 'genmodule', 'type': 'executable', + 'toolsets': ['host'], 'dependencies': [ 'config_sources', ], diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 346cd99..f805b09 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -537,7 +537,7 @@ ], }, }], - ['OS=="linux" and target_arch=="x64"', { + ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', { # Shared libraries need -fPIC on x86-64 'cflags': ['-fPIC'] }], |