Fixup chromium specific bits after merge.

chromium/config/Chromium/mac/ia32/config.h

Index: chromium/config/Chromium/mac/ia32/config.h
diff --git a/chromium/config/Chromium/mac/ia32/config.h b/chromium/config/Chromium/mac/ia32/config.h
index 706a98a9ea91cd885a424ff35fc5b82d0c0c31be..5b1a00a69fab58cd57b7dfa658d0d466dcdfa5f4 100644
--- a/chromium/config/Chromium/mac/ia32/config.h
+++ b/chromium/config/Chromium/mac/ia32/config.h
@@ -4,6 +4,7 @@
 #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 --arch=i686 --enable-yasm --extra-cflags=-m32 --extra-ldflags=-m32"
 #define FFMPEG_LICENSE "LGPL version 2.1 or later"
 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
+#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
 #define CC_TYPE "gcc"
 #define CC_VERSION __VERSION__
 #define restrict restrict
@@ -53,21 +54,24 @@
 #define HAVE_FAST_UNALIGNED 1
 #define HAVE_PTHREADS 1
 #define HAVE_W32THREADS 0
+#define HAVE_OS2THREADS 0
 #define HAVE_ALIGNED_STACK 1
 #define HAVE_ALSA_ASOUNDLIB_H 0
 #define HAVE_ALTIVEC_H 0
 #define HAVE_ARPA_INET_H 0
+#define HAVE_ASM_MOD_Y 0
+#define HAVE_ASM_TYPES_H 0
 #define HAVE_ATTRIBUTE_MAY_ALIAS 1
 #define HAVE_ATTRIBUTE_PACKED 1
-#define HAVE_BSWAP 1
+#define HAVE_CBRTF 1
 #define HAVE_CLOSESOCKET 0
 #define HAVE_CMOV 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_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
 #define HAVE_DLFCN_H 1
 #define HAVE_DLOPEN 1
 #define HAVE_DOS_PATHS 0
@@ -82,17 +86,19 @@
 #define HAVE_FORK 1
 #define HAVE_GETADDRINFO 1
 #define HAVE_GETHRTIME 0
+#define HAVE_GETPROCESSAFFINITYMASK 0
 #define HAVE_GETPROCESSMEMORYINFO 0
 #define HAVE_GETPROCESSTIMES 0
 #define HAVE_GETRUSAGE 1
 #define HAVE_GNU_AS 0
-#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_IBM_ASM 0
 #define HAVE_INET_ATON 1
 #define HAVE_INLINE_ASM 1
 #define HAVE_ISATTY 1
 #define HAVE_KBHIT 0
 #define HAVE_LDBRX 0
+#define HAVE_LIBDC1394_1 0
+#define HAVE_LIBDC1394_2 0
 #define HAVE_LLRINT 1
 #define HAVE_LLRINTF 1
 #define HAVE_LOCAL_ALIGNED_16 1
@@ -106,33 +112,41 @@
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACHINE_IOCTL_BT848_H 0
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
+#define HAVE_MAKEINFO 1
 #define HAVE_MALLOC_H 0
 #define HAVE_MAPVIEWOFFILE 0
 #define HAVE_MEMALIGN 0
 #define HAVE_MKSTEMP 1
 #define HAVE_MMAP 1
+#define HAVE_PEEKNAMEDPIPE 0
+#define HAVE_POLL_H 1
 #define HAVE_POSIX_MEMALIGN 0
 #define HAVE_ROUND 1
 #define HAVE_ROUNDF 1
+#define HAVE_SCHED_GETAFFINITY 0
 #define HAVE_SDL 0
 #define HAVE_SDL_VIDEO_SIZE 0
 #define HAVE_SETMODE 0
+#define HAVE_SETRLIMIT 1
 #define HAVE_SNDIO_H 0
 #define HAVE_SOCKLEN_T 0
 #define HAVE_SOUNDCARD_H 0
-#define HAVE_POLL_H 1
-#define HAVE_SETRLIMIT 1
 #define HAVE_STRERROR_R 1
-#define HAVE_STRTOK_R 1
+#define HAVE_STRPTIME 1
 #define HAVE_STRUCT_ADDRINFO 0
 #define HAVE_STRUCT_IPV6_MREQ 0
+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
 #define HAVE_STRUCT_SOCKADDR_IN6 0
 #define HAVE_STRUCT_SOCKADDR_SA_LEN 0
 #define HAVE_STRUCT_SOCKADDR_STORAGE 0
+#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
 #define HAVE_SYMVER 0
-#define HAVE_SYMVER_GNU_ASM 0
 #define HAVE_SYMVER_ASM_LABEL 0
+#define HAVE_SYMVER_GNU_ASM 0
+#define HAVE_SYSCONF 1
+#define HAVE_SYSCTL 1
 #define HAVE_SYS_MMAN_H 1
+#define HAVE_SYS_PARAM_H 1
 #define HAVE_SYS_RESOURCE_H 1
 #define HAVE_SYS_SELECT_H 1
 #define HAVE_SYS_SOUNDCARD_H 0
@@ -157,7 +171,14 @@
 #define CONFIG_MUXERS 0
 #define CONFIG_OUTDEVS 0
 #define CONFIG_PARSERS 1
-#define CONFIG_PROTOCOLS 1
+#define CONFIG_PROTOCOLS 0
+#define CONFIG_FFPLAY 0
+#define CONFIG_FFPROBE 1
+#define CONFIG_FFSERVER 0
+#define CONFIG_FFMPEG 0
+#define CONFIG_AVPLAY 0
+#define CONFIG_AVPROBE 0
+#define CONFIG_AVSERVER 0
 #define CONFIG_AANDCT 0
 #define CONFIG_AC3DSP 0
 #define CONFIG_AVCODEC 1
@@ -172,35 +193,41 @@
 #define CONFIG_DWT 0
 #define CONFIG_DXVA2 0
 #define CONFIG_FASTDIV 1
-#define CONFIG_FFMPEG 0
-#define CONFIG_FFPLAY 0
-#define CONFIG_FFPROBE 1
-#define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_FREI0R 0
+#define CONFIG_GNUTLS 0
 #define CONFIG_GOLOMB 1
 #define CONFIG_GPL 0
 #define CONFIG_GRAY 0
+#define CONFIG_H264CHROMA 0
 #define CONFIG_H264DSP 0
 #define CONFIG_H264PRED 1
 #define CONFIG_HARDCODED_TABLES 0
 #define CONFIG_HUFFMAN 0
+#define CONFIG_LIBAACPLUS 0
+#define CONFIG_LIBASS 0
+#define CONFIG_LIBCDIO 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBDC1394 0
 #define CONFIG_LIBDIRAC 0
 #define CONFIG_LIBFAAC 0
 #define CONFIG_LIBFREETYPE 0
 #define CONFIG_LIBGSM 0
+#define CONFIG_LIBMODPLUG 0
 #define CONFIG_LIBMP3LAME 0
 #define CONFIG_LIBNUT 0
 #define CONFIG_LIBOPENCORE_AMRNB 0
 #define CONFIG_LIBOPENCORE_AMRWB 0
 #define CONFIG_LIBOPENCV 0
 #define CONFIG_LIBOPENJPEG 0
+#define CONFIG_LIBPULSE 0
 #define CONFIG_LIBRTMP 0
 #define CONFIG_LIBSCHROEDINGER 0
 #define CONFIG_LIBSPEEX 0
+#define CONFIG_LIBSTAGEFRIGHT_H264 0
 #define CONFIG_LIBTHEORA 0
+#define CONFIG_LIBUTVIDEO 0
+#define CONFIG_LIBV4L2 0
 #define CONFIG_LIBVO_AACENC 0
 #define CONFIG_LIBVO_AMRWBENC 0
 #define CONFIG_LIBVORBIS 0
@@ -217,27 +244,45 @@
 #define CONFIG_NETWORK 0
 #define CONFIG_NONFREE 0
 #define CONFIG_OPENAL 0
+#define CONFIG_OPENSSL 0
 #define CONFIG_PIC 1
 #define CONFIG_POSTPROC 0
 #define CONFIG_RDFT 1
 #define CONFIG_RTPDEC 0
 #define CONFIG_RUNTIME_CPUDETECT 0
+#define CONFIG_SAFE_BITSTREAM_READER 1
 #define CONFIG_SHARED 1
 #define CONFIG_SINEWIN 0
 #define CONFIG_SMALL 0
 #define CONFIG_SRAM 0
 #define CONFIG_STATIC 1
+#define CONFIG_SWRESAMPLE 1
 #define CONFIG_SWSCALE 0
 #define CONFIG_SWSCALE_ALPHA 1
 #define CONFIG_THUMB 0
 #define CONFIG_VAAPI 0
+#define CONFIG_VDA 0
 #define CONFIG_VDPAU 0
 #define CONFIG_VERSION3 0
+#define CONFIG_XMM_CLOBBER_TEST 0
 #define CONFIG_X11GRAB 0
 #define CONFIG_ZLIB 0
 #define CONFIG_AVUTIL 1
 #define CONFIG_GPLV3 0
 #define CONFIG_LGPLV3 0
+#define CONFIG_AAC_ADTSTOASC_BSF 0
+#define CONFIG_CHOMP_BSF 0
+#define CONFIG_DUMP_EXTRADATA_BSF 0
+#define CONFIG_H264_MP4TOANNEXB_BSF 0
+#define CONFIG_IMX_DUMP_HEADER_BSF 0
+#define CONFIG_MJPEG2JPEG_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_AASC_DECODER 0
 #define CONFIG_AMV_DECODER 0
 #define CONFIG_ANM_DECODER 0
@@ -246,11 +291,13 @@
 #define CONFIG_ASV2_DECODER 0
 #define CONFIG_AURA_DECODER 0
 #define CONFIG_AURA2_DECODER 0
+#define CONFIG_AVRP_DECODER 0
 #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_BMV_VIDEO_DECODER 0
 #define CONFIG_C93_DECODER 0
 #define CONFIG_CAVS_DECODER 0
 #define CONFIG_CDGRAPHICS_DECODER 0
@@ -259,11 +306,13 @@
 #define CONFIG_CSCD_DECODER 0
 #define CONFIG_CYUV_DECODER 0
 #define CONFIG_DFA_DECODER 0
+#define CONFIG_DIRAC_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_DXTORY_DECODER 0
 #define CONFIG_EACMV_DECODER 0
 #define CONFIG_EAMAD_DECODER 0
 #define CONFIG_EATGQ_DECODER 0
@@ -272,11 +321,12 @@
 #define CONFIG_EIGHTBPS_DECODER 0
 #define CONFIG_EIGHTSVX_EXP_DECODER 0
 #define CONFIG_EIGHTSVX_FIB_DECODER 0
-#define CONFIG_EIGHTSVX_RAW_DECODER 0
 #define CONFIG_ESCAPE124_DECODER 0
+#define CONFIG_ESCAPE130_DECODER 0
 #define CONFIG_FFV1_DECODER 0
 #define CONFIG_FFVHUFF_DECODER 0
 #define CONFIG_FLASHSV_DECODER 0
+#define CONFIG_FLASHSV2_DECODER 0
 #define CONFIG_FLIC_DECODER 0
 #define CONFIG_FLV_DECODER 0
 #define CONFIG_FOURXM_DECODER 0
@@ -295,6 +345,7 @@
 #define CONFIG_IFF_ILBM_DECODER 0
 #define CONFIG_INDEO2_DECODER 0
 #define CONFIG_INDEO3_DECODER 0
+#define CONFIG_INDEO4_DECODER 0
 #define CONFIG_INDEO5_DECODER 0
 #define CONFIG_INTERPLAY_VIDEO_DECODER 0
 #define CONFIG_JPEG2000_DECODER 0
@@ -337,6 +388,8 @@
 #define CONFIG_PICTOR_DECODER 0
 #define CONFIG_PNG_DECODER 0
 #define CONFIG_PPM_DECODER 0
+#define CONFIG_PRORES_DECODER 0
+#define CONFIG_PRORES_LGPL_DECODER 0
 #define CONFIG_PTX_DECODER 0
 #define CONFIG_QDRAW_DECODER 0
 #define CONFIG_QPEG_DECODER 0
@@ -371,12 +424,17 @@
 #define CONFIG_TSCC_DECODER 0
 #define CONFIG_TXD_DECODER 0
 #define CONFIG_ULTI_DECODER 0
+#define CONFIG_UTVIDEO_DECODER 0
 #define CONFIG_V210_DECODER 0
 #define CONFIG_V210X_DECODER 0
+#define CONFIG_V308_DECODER 0
+#define CONFIG_V410_DECODER 0
 #define CONFIG_VB_DECODER 0
+#define CONFIG_VBLE_DECODER 0
 #define CONFIG_VC1_DECODER 0
 #define CONFIG_VC1_CRYSTALHD_DECODER 0
 #define CONFIG_VC1_VDPAU_DECODER 0
+#define CONFIG_VC1IMAGE_DECODER 0
 #define CONFIG_VCR1_DECODER 0
 #define CONFIG_VMDVIDEO_DECODER 0
 #define CONFIG_VMNC_DECODER 0
@@ -392,11 +450,15 @@
 #define CONFIG_WMV3_DECODER 0
 #define CONFIG_WMV3_CRYSTALHD_DECODER 0
 #define CONFIG_WMV3_VDPAU_DECODER 0
+#define CONFIG_WMV3IMAGE_DECODER 0
 #define CONFIG_WNV1_DECODER 0
 #define CONFIG_XAN_WC3_DECODER 0
 #define CONFIG_XAN_WC4_DECODER 0
 #define CONFIG_XL_DECODER 0
+#define CONFIG_XWD_DECODER 0
+#define CONFIG_Y41P_DECODER 0
 #define CONFIG_YOP_DECODER 0
+#define CONFIG_YUV4_DECODER 0
 #define CONFIG_ZLIB_DECODER 0
 #define CONFIG_ZMBV_DECODER 0
 #define CONFIG_AAC_DECODER 0
@@ -411,11 +473,15 @@
 #define CONFIG_ATRAC3_DECODER 0
 #define CONFIG_BINKAUDIO_DCT_DECODER 0
 #define CONFIG_BINKAUDIO_RDFT_DECODER 0
+#define CONFIG_BMV_AUDIO_DECODER 0
 #define CONFIG_COOK_DECODER 0
 #define CONFIG_DCA_DECODER 0
 #define CONFIG_DSICINAUDIO_DECODER 0
 #define CONFIG_EAC3_DECODER 0
+#define CONFIG_FFWAVESYNTH_DECODER 0
 #define CONFIG_FLAC_DECODER 0
+#define CONFIG_G723_1_DECODER 0
+#define CONFIG_G729_DECODER 0
 #define CONFIG_GSM_DECODER 0
 #define CONFIG_GSM_MS_DECODER 0
 #define CONFIG_IMC_DECODER 0
@@ -450,6 +516,7 @@
 #define CONFIG_VMDAUDIO_DECODER 0
 #define CONFIG_VORBIS_DECODER 1
 #define CONFIG_WAVPACK_DECODER 0
+#define CONFIG_WMALOSSLESS_DECODER 0
 #define CONFIG_WMAPRO_DECODER 0
 #define CONFIG_WMAV1_DECODER 0
 #define CONFIG_WMAV2_DECODER 0
@@ -465,6 +532,7 @@
 #define CONFIG_PCM_LXF_DECODER 0
 #define CONFIG_PCM_MULAW_DECODER 0
 #define CONFIG_PCM_S8_DECODER 0
+#define CONFIG_PCM_S8_PLANAR_DECODER 0
 #define CONFIG_PCM_S16BE_DECODER 0
 #define CONFIG_PCM_S16LE_DECODER 1
 #define CONFIG_PCM_S16LE_PLANAR_DECODER 0
@@ -497,6 +565,7 @@
 #define CONFIG_ADPCM_G722_DECODER 0
 #define CONFIG_ADPCM_G726_DECODER 0
 #define CONFIG_ADPCM_IMA_AMV_DECODER 0
+#define CONFIG_ADPCM_IMA_APC_DECODER 0
 #define CONFIG_ADPCM_IMA_DK3_DECODER 0
 #define CONFIG_ADPCM_IMA_DK4_DECODER 0
 #define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
@@ -529,172 +598,17 @@
 #define CONFIG_LIBOPENJPEG_DECODER 0
 #define CONFIG_LIBSCHROEDINGER_DECODER 0
 #define CONFIG_LIBSPEEX_DECODER 0
+#define CONFIG_LIBSTAGEFRIGHT_H264_DECODER 0
+#define CONFIG_LIBUTVIDEO_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
-#define CONFIG_DNXHD_ENCODER 0
-#define CONFIG_DPX_ENCODER 0
-#define CONFIG_DVVIDEO_ENCODER 0
-#define CONFIG_FFV1_ENCODER 0
-#define CONFIG_FFVHUFF_ENCODER 0
-#define CONFIG_FLASHSV_ENCODER 0
-#define CONFIG_FLASHSV2_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_MSMPEG4V2_ENCODER 0
-#define CONFIG_MSMPEG4V3_ENCODER 0
-#define CONFIG_MSVIDEO1_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_AC3_FIXED_ENCODER 0
-#define CONFIG_AC3_FLOAT_ENCODER 0
-#define CONFIG_ALAC_ENCODER 0
-#define CONFIG_DCA_ENCODER 0
-#define CONFIG_EAC3_ENCODER 0
-#define CONFIG_FLAC_ENCODER 0
-#define CONFIG_MP2_ENCODER 0
-#define CONFIG_NELLYMOSER_ENCODER 0
-#define CONFIG_RA_144_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_G722_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_ASS_ENCODER 0
-#define CONFIG_DVBSUB_ENCODER 0
-#define CONFIG_DVDSUB_ENCODER 0
-#define CONFIG_SRT_ENCODER 0
-#define CONFIG_XSUB_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_LIBVO_AACENC_ENCODER 0
-#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
-#define CONFIG_LIBVORBIS_ENCODER 0
-#define CONFIG_LIBVPX_ENCODER 0
-#define CONFIG_LIBX264_ENCODER 0
-#define CONFIG_LIBXAVS_ENCODER 0
-#define CONFIG_LIBXVID_ENCODER 0
-#define CONFIG_H263_VAAPI_HWACCEL 0
-#define CONFIG_H264_DXVA2_HWACCEL 0
-#define CONFIG_H264_VAAPI_HWACCEL 0
-#define CONFIG_MPEG1_VDPAU_HWACCEL 0
-#define CONFIG_MPEG2_DXVA2_HWACCEL 0
-#define CONFIG_MPEG2_VAAPI_HWACCEL 0
-#define CONFIG_MPEG2_VDPAU_HWACCEL 0
-#define CONFIG_MPEG4_VAAPI_HWACCEL 0
-#define CONFIG_VC1_DXVA2_HWACCEL 0
-#define CONFIG_VC1_VAAPI_HWACCEL 0
-#define CONFIG_WMV3_DXVA2_HWACCEL 0
-#define CONFIG_WMV3_VAAPI_HWACCEL 0
-#define CONFIG_AAC_PARSER 0
-#define CONFIG_AAC_LATM_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_FLAC_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_VP8_PARSER 1
-#define CONFIG_AAC_ADTSTOASC_BSF 0
-#define CONFIG_CHOMP_BSF 0
-#define CONFIG_DUMP_EXTRADATA_BSF 0
-#define CONFIG_H264_MP4TOANNEXB_BSF 0
-#define CONFIG_IMX_DUMP_HEADER_BSF 0
-#define CONFIG_MJPEG2JPEG_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_BINTEXT_DECODER 0
+#define CONFIG_XBIN_DECODER 0
+#define CONFIG_IDF_DECODER 0
 #define CONFIG_AAC_DEMUXER 0
 #define CONFIG_AC3_DEMUXER 0
+#define CONFIG_ACT_DEMUXER 0
+#define CONFIG_ADF_DEMUXER 0
+#define CONFIG_ADX_DEMUXER 0
 #define CONFIG_AEA_DEMUXER 0
 #define CONFIG_AIFF_DEMUXER 0
 #define CONFIG_AMR_DEMUXER 0
@@ -710,7 +624,10 @@
 #define CONFIG_AVS_DEMUXER 0
 #define CONFIG_BETHSOFTVID_DEMUXER 0
 #define CONFIG_BFI_DEMUXER 0
+#define CONFIG_BINTEXT_DEMUXER 0
 #define CONFIG_BINK_DEMUXER 0
+#define CONFIG_BIT_DEMUXER 0
+#define CONFIG_BMV_DEMUXER 0
 #define CONFIG_C93_DEMUXER 0
 #define CONFIG_CAF_DEMUXER 0
 #define CONFIG_CAVSVIDEO_DEMUXER 0
@@ -734,12 +651,16 @@
 #define CONFIG_FLV_DEMUXER 0
 #define CONFIG_FOURXM_DEMUXER 0
 #define CONFIG_G722_DEMUXER 0
+#define CONFIG_G723_1_DEMUXER 0
+#define CONFIG_G729_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_ICO_DEMUXER 0
 #define CONFIG_IDCIN_DEMUXER 0
+#define CONFIG_IDF_DEMUXER 0
 #define CONFIG_IFF_DEMUXER 0
 #define CONFIG_IMAGE2_DEMUXER 0
 #define CONFIG_IMAGE2PIPE_DEMUXER 0
@@ -749,7 +670,9 @@
 #define CONFIG_IV8_DEMUXER 0
 #define CONFIG_IVF_DEMUXER 0
 #define CONFIG_JV_DEMUXER 0
+#define CONFIG_LATM_DEMUXER 0
 #define CONFIG_LMLM4_DEMUXER 0
+#define CONFIG_LOAS_DEMUXER 0
 #define CONFIG_LXF_DEMUXER 0
 #define CONFIG_M4V_DEMUXER 0
 #define CONFIG_MATROSKA_DEMUXER 1
@@ -810,11 +733,13 @@
 #define CONFIG_RTP_DEMUXER 0
 #define CONFIG_RTSP_DEMUXER 0
 #define CONFIG_SAP_DEMUXER 0
+#define CONFIG_SBG_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_SMJPEG_DEMUXER 0
 #define CONFIG_SOL_DEMUXER 0
 #define CONFIG_SOX_DEMUXER 0
 #define CONFIG_SPDIF_DEMUXER 0
@@ -836,19 +761,256 @@
 #define CONFIG_W64_DEMUXER 0
 #define CONFIG_WAV_DEMUXER 1
 #define CONFIG_WC3_DEMUXER 0
-#define CONFIG_WEBP_DEMUXER 0
 #define CONFIG_WSAUD_DEMUXER 0
 #define CONFIG_WSVQA_DEMUXER 0
 #define CONFIG_WTV_DEMUXER 0
 #define CONFIG_WV_DEMUXER 0
 #define CONFIG_XA_DEMUXER 0
+#define CONFIG_XBIN_DEMUXER 0
+#define CONFIG_XMV_DEMUXER 0
 #define CONFIG_XWMA_DEMUXER 0
 #define CONFIG_YOP_DEMUXER 0
 #define CONFIG_YUV4MPEGPIPE_DEMUXER 0
+#define CONFIG_LIBMODPLUG_DEMUXER 0
 #define CONFIG_LIBNUT_DEMUXER 0
+#define CONFIG_A64MULTI_ENCODER 0
+#define CONFIG_A64MULTI5_ENCODER 0
+#define CONFIG_AMV_ENCODER 0
+#define CONFIG_ASV1_ENCODER 0
+#define CONFIG_ASV2_ENCODER 0
+#define CONFIG_AVRP_ENCODER 0
+#define CONFIG_BMP_ENCODER 0
+#define CONFIG_CLJR_ENCODER 0
+#define CONFIG_DNXHD_ENCODER 0
+#define CONFIG_DPX_ENCODER 0
+#define CONFIG_DVVIDEO_ENCODER 0
+#define CONFIG_FFV1_ENCODER 0
+#define CONFIG_FFVHUFF_ENCODER 0
+#define CONFIG_FLASHSV_ENCODER 0
+#define CONFIG_FLASHSV2_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_JPEG2000_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_MSMPEG4V2_ENCODER 0
+#define CONFIG_MSMPEG4V3_ENCODER 0
+#define CONFIG_MSVIDEO1_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_PRORES_ENCODER 0
+#define CONFIG_QTRLE_ENCODER 0
+#define CONFIG_R10K_ENCODER 0
+#define CONFIG_R210_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_V308_ENCODER 0
+#define CONFIG_V410_ENCODER 0
+#define CONFIG_WMV1_ENCODER 0
+#define CONFIG_WMV2_ENCODER 0
+#define CONFIG_XWD_ENCODER 0
+#define CONFIG_Y41P_ENCODER 0
+#define CONFIG_YUV4_ENCODER 0
+#define CONFIG_ZLIB_ENCODER 0
+#define CONFIG_ZMBV_ENCODER 0
+#define CONFIG_AAC_ENCODER 0
+#define CONFIG_AC3_ENCODER 0
+#define CONFIG_AC3_FIXED_ENCODER 0
+#define CONFIG_ALAC_ENCODER 0
+#define CONFIG_DCA_ENCODER 0
+#define CONFIG_EAC3_ENCODER 0
+#define CONFIG_FLAC_ENCODER 0
+#define CONFIG_G723_1_ENCODER 0
+#define CONFIG_MP2_ENCODER 0
+#define CONFIG_NELLYMOSER_ENCODER 0
+#define CONFIG_RA_144_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_ROQ_DPCM_ENCODER 0
+#define CONFIG_ADPCM_ADX_ENCODER 0
+#define CONFIG_ADPCM_G722_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_ASS_ENCODER 0
+#define CONFIG_DVBSUB_ENCODER 0
+#define CONFIG_DVDSUB_ENCODER 0
+#define CONFIG_SRT_ENCODER 0
+#define CONFIG_XSUB_ENCODER 0
+#define CONFIG_LIBAACPLUS_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_LIBOPENJPEG_ENCODER 0
+#define CONFIG_LIBSCHROEDINGER_ENCODER 0
+#define CONFIG_LIBSPEEX_ENCODER 0
+#define CONFIG_LIBTHEORA_ENCODER 0
+#define CONFIG_LIBVO_AACENC_ENCODER 0
+#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
+#define CONFIG_LIBVORBIS_ENCODER 0
+#define CONFIG_LIBVPX_ENCODER 0
+#define CONFIG_LIBX264_ENCODER 0
+#define CONFIG_LIBX264RGB_ENCODER 0
+#define CONFIG_LIBXAVS_ENCODER 0
+#define CONFIG_LIBXVID_ENCODER 0
+#define CONFIG_ACONVERT_FILTER 0
+#define CONFIG_AFORMAT_FILTER 0
+#define CONFIG_AMERGE_FILTER 0
+#define CONFIG_ANULL_FILTER 0
+#define CONFIG_ARESAMPLE_FILTER 0
+#define CONFIG_ASHOWINFO_FILTER 0
+#define CONFIG_ASPLIT_FILTER 0
+#define CONFIG_ASTREAMSYNC_FILTER 0
+#define CONFIG_EARWAX_FILTER 0
+#define CONFIG_PAN_FILTER 0
+#define CONFIG_SILENCEDETECT_FILTER 0
+#define CONFIG_VOLUME_FILTER 0
+#define CONFIG_ABUFFER_FILTER 0
+#define CONFIG_AEVALSRC_FILTER 0
+#define CONFIG_AMOVIE_FILTER 0
+#define CONFIG_ANULLSRC_FILTER 0
+#define CONFIG_ABUFFERSINK_FILTER 0
+#define CONFIG_ANULLSINK_FILTER 0
+#define CONFIG_ASS_FILTER 0
+#define CONFIG_BLACKFRAME_FILTER 0
+#define CONFIG_BOXBLUR_FILTER 0
+#define CONFIG_COPY_FILTER 0
+#define CONFIG_CROP_FILTER 0
+#define CONFIG_CROPDETECT_FILTER 0
+#define CONFIG_DELOGO_FILTER 0
+#define CONFIG_DESHAKE_FILTER 0
+#define CONFIG_DRAWBOX_FILTER 0
+#define CONFIG_DRAWTEXT_FILTER 0
+#define CONFIG_FADE_FILTER 0
+#define CONFIG_FIELDORDER_FILTER 0
+#define CONFIG_FIFO_FILTER 0
+#define CONFIG_FORMAT_FILTER 0
+#define CONFIG_FREI0R_FILTER 0
+#define CONFIG_GRADFUN_FILTER 0
+#define CONFIG_HFLIP_FILTER 0
+#define CONFIG_HQDN3D_FILTER 0
+#define CONFIG_LUT_FILTER 0
+#define CONFIG_LUTRGB_FILTER 0
+#define CONFIG_LUTYUV_FILTER 0
+#define CONFIG_MP_FILTER 0
+#define CONFIG_NEGATE_FILTER 0
+#define CONFIG_NOFORMAT_FILTER 0
+#define CONFIG_NULL_FILTER 0
+#define CONFIG_OCV_FILTER 0
+#define CONFIG_OVERLAY_FILTER 0
+#define CONFIG_PAD_FILTER 0
+#define CONFIG_PIXDESCTEST_FILTER 0
+#define CONFIG_SCALE_FILTER 0
+#define CONFIG_SELECT_FILTER 0
+#define CONFIG_SETDAR_FILTER 0
+#define CONFIG_SETPTS_FILTER 0
+#define CONFIG_SETSAR_FILTER 0
+#define CONFIG_SETTB_FILTER 0
+#define CONFIG_SHOWINFO_FILTER 0
+#define CONFIG_SLICIFY_FILTER 0
+#define CONFIG_SPLIT_FILTER 0
+#define CONFIG_THUMBNAIL_FILTER 0
+#define CONFIG_TINTERLACE_FILTER 0
+#define CONFIG_TRANSPOSE_FILTER 0
+#define CONFIG_UNSHARP_FILTER 0
+#define CONFIG_VFLIP_FILTER 0
+#define CONFIG_YADIF_FILTER 0
+#define CONFIG_CELLAUTO_FILTER 0
+#define CONFIG_COLOR_FILTER 0
+#define CONFIG_FREI0R_SRC_FILTER 0
+#define CONFIG_LIFE_FILTER 0
+#define CONFIG_MANDELBROT_FILTER 0
+#define CONFIG_MOVIE_FILTER 0
+#define CONFIG_MPTESTSRC_FILTER 0
+#define CONFIG_NULLSRC_FILTER 0
+#define CONFIG_RGBTESTSRC_FILTER 0
+#define CONFIG_TESTSRC_FILTER 0
+#define CONFIG_BUFFERSINK_FILTER 0
+#define CONFIG_NULLSINK_FILTER 0
+#define CONFIG_H263_VAAPI_HWACCEL 0
+#define CONFIG_H264_DXVA2_HWACCEL 0
+#define CONFIG_H264_VAAPI_HWACCEL 0
+#define CONFIG_H264_VDA_HWACCEL 0
+#define CONFIG_MPEG1_VDPAU_HWACCEL 0
+#define CONFIG_MPEG2_DXVA2_HWACCEL 0
+#define CONFIG_MPEG2_VAAPI_HWACCEL 0
+#define CONFIG_MPEG2_VDPAU_HWACCEL 0
+#define CONFIG_MPEG4_VAAPI_HWACCEL 0
+#define CONFIG_VC1_DXVA2_HWACCEL 0
+#define CONFIG_VC1_VAAPI_HWACCEL 0
+#define CONFIG_WMV3_DXVA2_HWACCEL 0
+#define CONFIG_WMV3_VAAPI_HWACCEL 0
+#define CONFIG_ALSA_INDEV 0
+#define CONFIG_BKTR_INDEV 0
+#define CONFIG_DSHOW_INDEV 0
+#define CONFIG_DV1394_INDEV 0
+#define CONFIG_FBDEV_INDEV 0
+#define CONFIG_JACK_INDEV 0
+#define CONFIG_LAVFI_INDEV 0
+#define CONFIG_OPENAL_INDEV 0
+#define CONFIG_OSS_INDEV 0
+#define CONFIG_PULSE_INDEV 0
+#define CONFIG_SNDIO_INDEV 0
+#define CONFIG_V4L2_INDEV 0
+#define CONFIG_VFWCAP_INDEV 0
+#define CONFIG_X11_GRAB_DEVICE_INDEV 0
+#define CONFIG_LIBCDIO_INDEV 0
+#define CONFIG_LIBDC1394_INDEV 0
 #define CONFIG_A64_MUXER 0
 #define CONFIG_AC3_MUXER 0
 #define CONFIG_ADTS_MUXER 0
+#define CONFIG_ADX_MUXER 0
 #define CONFIG_AIFF_MUXER 0
 #define CONFIG_AMR_MUXER 0
 #define CONFIG_ASF_MUXER 0
@@ -857,6 +1019,7 @@
 #define CONFIG_AU_MUXER 0
 #define CONFIG_AVI_MUXER 0
 #define CONFIG_AVM2_MUXER 0
+#define CONFIG_BIT_MUXER 0
 #define CONFIG_CAF_MUXER 0
 #define CONFIG_CAVSVIDEO_MUXER 0
 #define CONFIG_CRC_MUXER 0
@@ -874,6 +1037,7 @@
 #define CONFIG_FRAMECRC_MUXER 0
 #define CONFIG_FRAMEMD5_MUXER 0
 #define CONFIG_G722_MUXER 0
+#define CONFIG_G723_1_MUXER 0
 #define CONFIG_GIF_MUXER 0
 #define CONFIG_GXF_MUXER 0
 #define CONFIG_H261_MUXER 0
@@ -882,7 +1046,9 @@
 #define CONFIG_IMAGE2_MUXER 0
 #define CONFIG_IMAGE2PIPE_MUXER 0
 #define CONFIG_IPOD_MUXER 0
+#define CONFIG_ISMV_MUXER 0
 #define CONFIG_IVF_MUXER 0
+#define CONFIG_LATM_MUXER 0
 #define CONFIG_M4V_MUXER 0
 #define CONFIG_MD5_MUXER 0
 #define CONFIG_MATROSKA_MUXER 0
@@ -909,6 +1075,7 @@
 #define CONFIG_NULL_MUXER 0
 #define CONFIG_NUT_MUXER 0
 #define CONFIG_OGG_MUXER 0
+#define CONFIG_OMA_MUXER 0
 #define CONFIG_PCM_ALAW_MUXER 0
 #define CONFIG_PCM_MULAW_MUXER 0
 #define CONFIG_PCM_F64BE_MUXER 0
@@ -937,75 +1104,62 @@
 #define CONFIG_RTP_MUXER 0
 #define CONFIG_RTSP_MUXER 0
 #define CONFIG_SAP_MUXER 0
+#define CONFIG_SEGMENT_MUXER 0
+#define CONFIG_SMJPEG_MUXER 0
 #define CONFIG_SOX_MUXER 0
 #define CONFIG_SPDIF_MUXER 0
 #define CONFIG_SRT_MUXER 0
 #define CONFIG_SWF_MUXER 0
 #define CONFIG_TG2_MUXER 0
 #define CONFIG_TGP_MUXER 0
+#define CONFIG_MKVTIMESTAMP_V2_MUXER 0
 #define CONFIG_TRUEHD_MUXER 0
 #define CONFIG_VC1T_MUXER 0
 #define CONFIG_VOC_MUXER 0
 #define CONFIG_WAV_MUXER 0
 #define CONFIG_WEBM_MUXER 0
-#define CONFIG_WEBP_MUXER 0
+#define CONFIG_WTV_MUXER 0
 #define CONFIG_YUV4MPEGPIPE_MUXER 0
 #define CONFIG_LIBNUT_MUXER 0
-#define CONFIG_ANULL_FILTER 0
-#define CONFIG_ANULLSRC_FILTER 0
-#define CONFIG_ANULLSINK_FILTER 0
-#define CONFIG_BLACKFRAME_FILTER 0
-#define CONFIG_COPY_FILTER 0
-#define CONFIG_CROP_FILTER 0
-#define CONFIG_CROPDETECT_FILTER 0
-#define CONFIG_DRAWBOX_FILTER 0
-#define CONFIG_DRAWTEXT_FILTER 0
-#define CONFIG_FADE_FILTER 0
-#define CONFIG_FIELDORDER_FILTER 0
-#define CONFIG_FIFO_FILTER 0
-#define CONFIG_FORMAT_FILTER 0
-#define CONFIG_FREI0R_FILTER 0
-#define CONFIG_GRADFUN_FILTER 0
-#define CONFIG_HFLIP_FILTER 0
-#define CONFIG_HQDN3D_FILTER 0
-#define CONFIG_LUT_FILTER 0
-#define CONFIG_LUTRGB_FILTER 0
-#define CONFIG_LUTYUV_FILTER 0
-#define CONFIG_MP_FILTER 0
-#define CONFIG_NEGATE_FILTER 0
-#define CONFIG_NOFORMAT_FILTER 0
-#define CONFIG_NULL_FILTER 0
-#define CONFIG_OCV_FILTER 0
-#define CONFIG_OVERLAY_FILTER 0
-#define CONFIG_PAD_FILTER 0
-#define CONFIG_PIXDESCTEST_FILTER 0
-#define CONFIG_SCALE_FILTER 0
-#define CONFIG_SELECT_FILTER 0
-#define CONFIG_SETDAR_FILTER 0
-#define CONFIG_SETPTS_FILTER 0
-#define CONFIG_SETSAR_FILTER 0
-#define CONFIG_SETTB_FILTER 0
-#define CONFIG_SHOWINFO_FILTER 0
-#define CONFIG_SLICIFY_FILTER 0
-#define CONFIG_SPLIT_FILTER 0
-#define CONFIG_TRANSPOSE_FILTER 0
-#define CONFIG_UNSHARP_FILTER 0
-#define CONFIG_VFLIP_FILTER 0
-#define CONFIG_YADIF_FILTER 0
-#define CONFIG_BUFFER_FILTER 0
-#define CONFIG_COLOR_FILTER 0
-#define CONFIG_FREI0R_SRC_FILTER 0
-#define CONFIG_MOVIE_FILTER 0
-#define CONFIG_NULLSRC_FILTER 0
-#define CONFIG_TESTSRC_FILTER 0
-#define CONFIG_BUFFERSINK_FILTER 0
-#define CONFIG_NULLSINK_FILTER 0
+#define CONFIG_ALSA_OUTDEV 0
+#define CONFIG_OSS_OUTDEV 0
+#define CONFIG_SDL_OUTDEV 0
+#define CONFIG_SNDIO_OUTDEV 0
+#define CONFIG_AAC_PARSER 0
+#define CONFIG_AAC_LATM_PARSER 0
+#define CONFIG_AC3_PARSER 0
+#define CONFIG_ADX_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_FLAC_PARSER 0
+#define CONFIG_GSM_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_RV30_PARSER 0
+#define CONFIG_RV40_PARSER 0
+#define CONFIG_VC1_PARSER 0
+#define CONFIG_VP3_PARSER 0
+#define CONFIG_VP8_PARSER 1
 #define CONFIG_APPLEHTTP_PROTOCOL 0
+#define CONFIG_CACHE_PROTOCOL 0
 #define CONFIG_CONCAT_PROTOCOL 0
 #define CONFIG_CRYPTO_PROTOCOL 0
 #define CONFIG_FILE_PROTOCOL 0
 #define CONFIG_GOPHER_PROTOCOL 0
 #define CONFIG_HTTP_PROTOCOL 0
+#define CONFIG_HTTPPROXY_PROTOCOL 0
+#define CONFIG_HTTPS_PROTOCOL 0
 #define CONFIG_MMSH_PROTOCOL 0
 #define CONFIG_MMST_PROTOCOL 0
 #define CONFIG_MD5_PROTOCOL 0
@@ -1017,23 +1171,6 @@
 #define CONFIG_RTMPS_PROTOCOL 0
 #define CONFIG_RTP_PROTOCOL 0
 #define CONFIG_TCP_PROTOCOL 0
+#define CONFIG_TLS_PROTOCOL 0
 #define CONFIG_UDP_PROTOCOL 0
-#define CONFIG_ALSA_INDEV 0
-#define CONFIG_BKTR_INDEV 0
-#define CONFIG_DSHOW_INDEV 0
-#define CONFIG_DV1394_INDEV 0
-#define CONFIG_FBDEV_INDEV 0
-#define CONFIG_JACK_INDEV 0
-#define CONFIG_OPENAL_INDEV 0
-#define CONFIG_OSS_INDEV 0
-#define CONFIG_SNDIO_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_OSS_OUTDEV 0
-#define CONFIG_SDL_OUTDEV 0
-#define CONFIG_SNDIO_OUTDEV 0
 #endif /* FFMPEG_CONFIG_H */