--- /usr/work/usr/home/amdmi3/projects/freebsd/ports/multimedia/mplayer/work/mplayer-export-2011-03-29/config.mak	2012-02-10 01:08:18.000000000 +0400
+++ /usr/work/pool/ports/multimedia/mplayer/work/mplayer-export-2011-12-18/config.mak	2012-02-10 00:52:28.000000000 +0400
@@ -3,7 +3,7 @@
 # Ensure that locale settings do not interfere with shell commands.
 export LC_ALL = C
 
-CONFIGURATION = --cc=cc --host-cc=cc --disable-bitmap-font --disable-liba52 --disable-ssse3 --disable-directfb --disable-faac --disable-faad --disable-libdca --disable-twolame --disable-x264 --disable-xvid --disable-libdirac-lavc --disable-mencoder --disable-mpg123 --disable-musepack --disable-inet6 --disable-libopenjpeg --disable-libschroedinger-lavc --disable-live --disable-jack --disable-nas --disable-openal --disable-pulse --disable-bluray --disable-smb --disable-fribidi --disable-cdparanoia --disable-ladspa --disable-liblzo --disable-win32dll --disable-qtx --disable-real --disable-libopencore_amrnb --disable-libopencore_amrwb --disable-libgsm --enable-tv-v4l1 --enable-tv-v4l2 --disable-librtmp --disable-mng --extra-libs=-lv4l1 -lv4l2 --enable-xvmc --with-xvmclib=XvMCW --disable-rtc --disable-arts --disable-lirc --disable-esd --disable-joystick --x-libraries=/usr/local/lib --x-includes=/usr/local/include --prefix=/usr/local --mandir=/usr/local/man --build=amd64-portbld-freebsd9.0
+CONFIGURATION = --cc=cc --host-cc=cc --as=as --extra-cflags=-I/usr/local/include -I/usr/local/include --extra-libs=-L/usr/local/lib --disable-bitmap-font --disable-liba52 --disable-alsa --enable-ass-internal --disable-enca --disable-directfb --disable-faac --disable-faad --disable-libdca --disable-twolame --disable-x264 --disable-xvid --disable-libdirac-lavc --disable-mencoder --disable-mpg123 --disable-musepack --disable-ssse3 --disable-fast-cmov --disable-inet6 --disable-libopenjpeg --disable-libschroedinger-lavc --disable-live --disable-jack --disable-nas --disable-openal --disable-pulse --disable-bluray --disable-smb --disable-fribidi --disable-cdparanoia --disable-ladspa --disable-liblzo --disable-win32dll --disable-qtx --disable-real --disable-libopencore_amrnb --disable-libopencore_amrwb --disable-libgsm --disable-librtmp --disable-mng --extra-libs=-lv4l1 -lv4l2 --enable-xvmc --with-xvmclib=XvMCW --disable-rtc --disable-arts --disable-lirc --disable-esd --disable-joystick --x-libraries=/usr/local/lib --x-includes=/usr/local/include --prefix=/usr/local --mandir=/usr/local/man --build=amd64-portbld-freebsd9.0
 
 CHARSET = UTF-8
 DOC_LANGS = en
@@ -11,6 +11,10 @@
 MAN_LANGS = en
 MAN_LANG_ALL = cs de en es fr hu it pl ru zh_CN
 
+CATALOG = /usr/local/share/sgml/catalog
+XMLLINT_COMMAND = xmllint --noout --noent --postvalid --catalogs $*
+XSLT_COMMAND = 
+
 prefix  = $(DESTDIR)/usr/local
 BINDIR  = $(DESTDIR)/usr/local/bin
 DATADIR = $(DESTDIR)/usr/local/share/mplayer
@@ -27,8 +31,8 @@
 INSTALLSTRIP = -s
 WINDRES = windres
 
-CFLAGS   = -Wundef -Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls -Wstrict-prototypes -Wmissing-prototypes -Wdisabled-optimization -Wno-pointer-sign -Wdeclaration-after-statement -std=gnu99  -O4 -march=native -mtune=native -pipe -ffast-math -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_FILE_OFFSET_BITS=64 -Ilibdvdread4 -I. -Iffmpeg  -I/usr/local/include  -I/usr/local/include -I/usr/local/include/   -I/usr/local/include/freetype2 -I/usr/local/include -I/usr/local/include   -DFF_API_MAX_STREAMS=0
-CXXFLAGS = -Wundef -Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls  -O4 -march=native -mtune=native -pipe -ffast-math -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -Ilibdvdread4 -I. -Iffmpeg  -I/usr/local/include  -I/usr/local/include -I/usr/local/include/   -I/usr/local/include/freetype2 -I/usr/local/include -I/usr/local/include   -DFF_API_MAX_STREAMS=0 
+CFLAGS   = -Wundef -Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls -Wstrict-prototypes -Wmissing-prototypes -Wdisabled-optimization -Wno-pointer-sign -Wdeclaration-after-statement -std=gnu99 -Werror-implicit-function-declaration -O4 -march=native -mtune=native -pipe -ffast-math -fomit-frame-pointer -fno-tree-vectorize -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_FILE_OFFSET_BITS=64 -Ilibdvdread4 -I. -Iffmpeg -I/usr/local/include -I/usr/local/include  -I/usr/local/include -I/usr/local/include/   -I/usr/local/include/freetype2 -I/usr/local/include -I/usr/local/include  
+CXXFLAGS = -Wundef -Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls  -O4 -march=native -mtune=native -pipe -ffast-math -fomit-frame-pointer -fno-tree-vectorize -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -Ilibdvdread4 -I. -Iffmpeg -I/usr/local/include -I/usr/local/include  -I/usr/local/include -I/usr/local/include/   -I/usr/local/include/freetype2 -I/usr/local/include -I/usr/local/include   
 CC_DEPFLAGS = -MD -MP
 
 CFLAGS_DHAHELPER         = 
@@ -40,7 +44,7 @@
 CFLAGS_SVGALIB_HELPER    = 
 CFLAGS_TREMOR_LOW        = 
 
-EXTRALIBS          = -Wl,-z,noexecstack  -L/usr/local/lib -ffast-math  -rpath=/usr/local/lib  -liconv -lncurses -lpng -lz -ljpeg -lungif -lcdio_cdda -lcdio -lcdio_paranoia  -L/usr/local/lib -lfreetype -lz -lbz2 -lfontconfig  -lass -lenca -lz /usr/lib/libbz2.so -lmad -lspeex -L/usr/local/lib -ltheora -logg   -ldv -lvpx -pthread  -rdynamic -L/usr/local/lib  -lm -lv4l1 -lv4l2
+EXTRALIBS          = -Wl,-z,noexecstack -lm  -L/usr/local/lib -ffast-math  -rpath=/usr/local/lib  -liconv /usr/lib/libncurses.so -lpng -lz -ljpeg -lungif -lcdio_cdda -lcdio -lcdio_paranoia  -L/usr/local/lib -lfreetype -lz -lbz2 -lfontconfig  -lz /usr/lib/libbz2.so -lmad -lspeex -L/usr/local/lib -ltheora -logg   -ldv -lvpx -pthread  -rdynamic -L/usr/local/lib  -lv4l1 -lv4l2
 EXTRALIBS_MPLAYER  =  -lXext -lX11 -pthread -lXss -lXv -lXvMC -lXvMCW -lvdpau -lXinerama -lXxf86vm -lXxf86dga -lggi -laa -lcaca -lvga -lSDL -lGL
 EXTRALIBS_MENCODER = 
 
@@ -58,32 +62,30 @@
 HAVE_MMX2 = yes
 HAVE_SSE = yes
 HAVE_SSE2 = yes
-HAVE_FAST_CMOV = yes
 HAVE_CMOV = yes
 HAVE_FAST_CLZ = yes
 
 MENCODER = no
 MPLAYER  = yes
 
-NEED_GETTIMEOFDAY = no
-NEED_GLOB         = no
-NEED_MMAP         = 
-NEED_SETENV       = no
-NEED_SHMEM        = yes
-NEED_STRSEP       = no
-NEED_SWAB         = no
-NEED_VSSCANF      = no
+# operating system features which have local fallbacks
+GETTIMEOFDAY = yes
+GLOB         = yes
+GLOB_WIN     = yes
+MMAP         = 
+SETENV       = yes
+SHMEM        = no
+STRSEP       = yes
+VSSCANF      = yes
 
 # features
 3DFX = no
 AA = yes
-ALSA1X = 
-ALSA9 = 
-ALSA5 = 
+ALSA = no
 APPLE_IR = auto
 APPLE_REMOTE = auto
 ARTS = no
-AUDIO_INPUT = yes
+AUDIO_INPUT = 
 BITMAP_FONT = no
 BL = no
 CACA = yes
@@ -115,6 +117,7 @@
 GL = yes
 GL_WIN32 = 
 GL_X11 = yes
+GL_EGL_X11 = 
 GL_SDL = yes
 MATRIXVIEW = yes
 GUI = no
@@ -131,7 +134,7 @@
 LADSPA = no
 LIBA52 = no
 LIBASS = yes
-LIBASS_INTERNAL = no
+LIBASS_INTERNAL = yes
 LIBBLURAY = no
 LIBBS2B = no
 LIBDCA = no
@@ -167,7 +170,7 @@
 PNM = yes
 PRIORITY = no
 PULSE = no
-PVR = no
+PVR = auto
 QTX_CODECS = no
 QTX_CODECS_WIN32 = 
 QTX_EMULATION = no
@@ -189,10 +192,10 @@
 TREMOR_INTERNAL = yes
 TV = yes
 TV_BSDBT848 = yes
-TV_DSHOW = no
-TV_V4L  = yes
-TV_V4L1 = yes
-TV_V4L2 = yes
+TV_DSHOW = auto
+TV_V4L  = 
+TV_V4L1 = auto
+TV_V4L2 = no
 TWOLAME=no
 UNRAR_EXEC = yes
 V4L2 = no
@@ -239,11 +242,19 @@
 FFMPEG     = yes
 FFMPEG_A   = yes
 
+CONFIG_AVCODEC  = yes
+CONFIG_AVFILTER = yes
+CONFIG_AVFORMAT = yes
+CONFIG_AVUTIL   = yes
+CONFIG_POSTPROC = yes
+CONFIG_SWSCALE  = yes
+
 ASFLAGS    = $(CFLAGS)
 AS_DEPFLAGS= -MD -MP
 HOSTCC     = $(HOST_CC)
 HOSTCFLAGS = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -O3
 HOSTLIBS   = -lm
+AS_O       = -o $@
 CC_O       = -o $@
 LD         = cc
 RANLIB     = ranlib
@@ -252,12 +263,16 @@
 YASMFLAGS  = -f elf  -m amd64
 
 CONFIG_STATIC = yes
-SRC_PATH      = ../../
-BUILD_ROOT    = ..
+SRC_PATH      = .
 LIBPREF       = lib
 LIBSUF        = .a
-LIBNAME       = $(LIBPREF)$(NAME)$(LIBSUF)
 FULLNAME      = $(NAME)$(BUILDSUF)
+LIBNAME       = $(LIBPREF)$(FULLNAME)$(LIBSUF)
+
+# These are not necessary for building, since we do not use shared libraries,
+# but without them target names clash, causing Make warnings by the boatload.
+SLIBNAME            = $(SLIBPREF)$(FULLNAME)$(SLIBSUF)
+SLIBNAME_WITH_MAJOR = $(SLIBNAME)-42
 
 # Some FFmpeg codecs depend on these. Enable them unconditionally for now.
 CONFIG_AANDCT  = yes
@@ -265,12 +280,14 @@
 CONFIG_DWT     = yes
 CONFIG_FFT     = yes
 CONFIG_GOLOMB  = yes
+CONFIG_H264CHROMA = yes
 CONFIG_H264DSP = yes
 CONFIG_H264PRED= yes
 CONFIG_HUFFMAN = yes
 CONFIG_LPC     = yes
 CONFIG_LSP     = yes
 CONFIG_MDCT    = yes
+CONFIG_MPEGAUDIODSP = yes
 CONFIG_RDFT    = yes
 CONFIG_SINEWIN = yes
 
@@ -279,15 +296,16 @@
 !CONFIG_LIBRTMP = yes
 CONFIG_LIBRTMP  = no
 
-CONFIG_AC3DSP   = no
+CONFIG_AC3DSP   = yes
 CONFIG_BZLIB    = yes
 CONFIG_CRYSTALHD= no
 CONFIG_ENCODERS = yes
 CONFIG_GPL      = yes
 CONFIG_MLIB     = no
-CONFIG_MUXERS   = no
-CONFIG_POSTPROC = yes
+CONFIG_MUXERS   = yes
+CONFIG_NETWORK  = yes
 CONFIG_RTPDEC   = yes
+CONFIG_VF_LAVFI = no
 CONFIG_VDPAU    = yes
 CONFIG_XVMC     = yes
 CONFIG_ZLIB     = yes
@@ -311,6 +329,7 @@
 CONFIG_BFI_DECODER=yes
 CONFIG_BINK_DECODER=yes
 CONFIG_BMP_DECODER=yes
+CONFIG_BMV_VIDEO_DECODER=yes
 CONFIG_C93_DECODER=yes
 CONFIG_CAVS_DECODER=yes
 CONFIG_CDGRAPHICS_DECODER=yes
@@ -318,11 +337,14 @@
 CONFIG_CLJR_DECODER=yes
 CONFIG_CSCD_DECODER=yes
 CONFIG_CYUV_DECODER=yes
+CONFIG_DFA_DECODER=yes
+CONFIG_DIRAC_DECODER=yes
 CONFIG_DNXHD_DECODER=yes
 CONFIG_DPX_DECODER=yes
 CONFIG_DSICINVIDEO_DECODER=yes
 CONFIG_DVVIDEO_DECODER=yes
 CONFIG_DXA_DECODER=yes
+CONFIG_DXTORY_DECODER=yes
 CONFIG_EACMV_DECODER=yes
 CONFIG_EAMAD_DECODER=yes
 CONFIG_EATGQ_DECODER=yes
@@ -332,9 +354,11 @@
 CONFIG_EIGHTSVX_EXP_DECODER=yes
 CONFIG_EIGHTSVX_FIB_DECODER=yes
 CONFIG_ESCAPE124_DECODER=yes
+CONFIG_ESCAPE130_DECODER=yes
 CONFIG_FFV1_DECODER=yes
 CONFIG_FFVHUFF_DECODER=yes
 CONFIG_FLASHSV_DECODER=yes
+CONFIG_FLASHSV2_DECODER=yes
 CONFIG_FLIC_DECODER=yes
 CONFIG_FLV_DECODER=yes
 CONFIG_FOURXM_DECODER=yes
@@ -354,6 +378,7 @@
 CONFIG_INDEO3_DECODER=yes
 CONFIG_INDEO5_DECODER=yes
 CONFIG_INTERPLAY_VIDEO_DECODER=yes
+CONFIG_JPEG2000_DECODER=yes
 CONFIG_JPEGLS_DECODER=yes
 CONFIG_JV_DECODER=yes
 CONFIG_KGV1_DECODER=yes
@@ -380,6 +405,7 @@
 CONFIG_MSRLE_DECODER=yes
 CONFIG_MSVIDEO1_DECODER=yes
 CONFIG_MSZH_DECODER=yes
+CONFIG_MXPEG_DECODER=yes
 CONFIG_NUV_DECODER=yes
 CONFIG_PAM_DECODER=yes
 CONFIG_PBM_DECODER=yes
@@ -389,6 +415,8 @@
 CONFIG_PICTOR_DECODER=yes
 CONFIG_PNG_DECODER=yes
 CONFIG_PPM_DECODER=yes
+CONFIG_PRORES_DECODER=yes
+CONFIG_PRORES_LGPL_DECODER=yes
 CONFIG_PTX_DECODER=yes
 CONFIG_QDRAW_DECODER=yes
 CONFIG_QPEG_DECODER=yes
@@ -403,6 +431,7 @@
 CONFIG_RV20_DECODER=yes
 CONFIG_RV30_DECODER=yes
 CONFIG_RV40_DECODER=yes
+CONFIG_S302M_DECODER=yes
 CONFIG_SGI_DECODER=yes
 CONFIG_SMACKER_DECODER=yes
 CONFIG_SMC_DECODER=yes
@@ -422,11 +451,15 @@
 CONFIG_TSCC_DECODER=yes
 CONFIG_TXD_DECODER=yes
 CONFIG_ULTI_DECODER=yes
+CONFIG_UTVIDEO_DECODER=yes
 CONFIG_V210_DECODER=yes
 CONFIG_V210X_DECODER=yes
+CONFIG_V410_DECODER=yes
 CONFIG_VB_DECODER=yes
+CONFIG_VBLE_DECODER=yes
 CONFIG_VC1_DECODER=yes
 CONFIG_VC1_VDPAU_DECODER=yes
+CONFIG_VC1IMAGE_DECODER=yes
 CONFIG_VCR1_DECODER=yes
 CONFIG_VMDVIDEO_DECODER=yes
 CONFIG_VMNC_DECODER=yes
@@ -441,6 +474,7 @@
 CONFIG_WMV2_DECODER=yes
 CONFIG_WMV3_DECODER=yes
 CONFIG_WMV3_VDPAU_DECODER=yes
+CONFIG_WMV3IMAGE_DECODER=yes
 CONFIG_WNV1_DECODER=yes
 CONFIG_XAN_WC3_DECODER=yes
 CONFIG_XAN_WC4_DECODER=yes
@@ -460,11 +494,15 @@
 CONFIG_ATRAC3_DECODER=yes
 CONFIG_BINKAUDIO_DCT_DECODER=yes
 CONFIG_BINKAUDIO_RDFT_DECODER=yes
+CONFIG_BMV_AUDIO_DECODER=yes
 CONFIG_COOK_DECODER=yes
 CONFIG_DCA_DECODER=yes
 CONFIG_DSICINAUDIO_DECODER=yes
 CONFIG_EAC3_DECODER=yes
+CONFIG_FFWAVESYNTH_DECODER=yes
 CONFIG_FLAC_DECODER=yes
+CONFIG_G723_1_DECODER=yes
+CONFIG_G729_DECODER=yes
 CONFIG_GSM_DECODER=yes
 CONFIG_GSM_MS_DECODER=yes
 CONFIG_IMC_DECODER=yes
@@ -499,6 +537,7 @@
 CONFIG_VMDAUDIO_DECODER=yes
 CONFIG_VORBIS_DECODER=yes
 CONFIG_WAVPACK_DECODER=yes
+CONFIG_WMALOSSLESS_DECODER=yes
 CONFIG_WMAPRO_DECODER=yes
 CONFIG_WMAV1_DECODER=yes
 CONFIG_WMAV2_DECODER=yes
@@ -514,6 +553,7 @@
 CONFIG_PCM_LXF_DECODER=yes
 CONFIG_PCM_MULAW_DECODER=yes
 CONFIG_PCM_S8_DECODER=yes
+CONFIG_PCM_S8_PLANAR_DECODER=yes
 CONFIG_PCM_S16BE_DECODER=yes
 CONFIG_PCM_S16LE_DECODER=yes
 CONFIG_PCM_S16LE_PLANAR_DECODER=yes
@@ -569,6 +609,9 @@
 CONFIG_PGSSUB_DECODER=yes
 CONFIG_SRT_DECODER=yes
 CONFIG_XSUB_DECODER=yes
+CONFIG_BINTEXT_DECODER=yes
+CONFIG_XBIN_DECODER=yes
+CONFIG_IDF_DECODER=yes
 CONFIG_LIBVPX_DECODER=yes
 CONFIG_PNG_ENCODER=yes
 CONFIG_MPEG1VIDEO_ENCODER=yes
@@ -577,6 +620,7 @@
 CONFIG_AAC_PARSER=yes
 CONFIG_AAC_LATM_PARSER=yes
 CONFIG_AC3_PARSER=yes
+CONFIG_ADX_PARSER=yes
 CONFIG_CAVSVIDEO_PARSER=yes
 CONFIG_DCA_PARSER=yes
 CONFIG_DIRAC_PARSER=yes
@@ -593,11 +637,16 @@
 CONFIG_MPEGAUDIO_PARSER=yes
 CONFIG_MPEGVIDEO_PARSER=yes
 CONFIG_PNM_PARSER=yes
+CONFIG_RV30_PARSER=yes
+CONFIG_RV40_PARSER=yes
 CONFIG_VC1_PARSER=yes
 CONFIG_VP3_PARSER=yes
 CONFIG_VP8_PARSER=yes
 CONFIG_AAC_DEMUXER=yes
 CONFIG_AC3_DEMUXER=yes
+CONFIG_ACT_DEMUXER=yes
+CONFIG_ADF_DEMUXER=yes
+CONFIG_ADX_DEMUXER=yes
 CONFIG_AEA_DEMUXER=yes
 CONFIG_AIFF_DEMUXER=yes
 CONFIG_AMR_DEMUXER=yes
@@ -612,12 +661,16 @@
 CONFIG_AVS_DEMUXER=yes
 CONFIG_BETHSOFTVID_DEMUXER=yes
 CONFIG_BFI_DEMUXER=yes
+CONFIG_BINTEXT_DEMUXER=yes
 CONFIG_BINK_DEMUXER=yes
+CONFIG_BIT_DEMUXER=yes
+CONFIG_BMV_DEMUXER=yes
 CONFIG_C93_DEMUXER=yes
 CONFIG_CAF_DEMUXER=yes
 CONFIG_CAVSVIDEO_DEMUXER=yes
 CONFIG_CDG_DEMUXER=yes
 CONFIG_DAUD_DEMUXER=yes
+CONFIG_DFA_DEMUXER=yes
 CONFIG_DIRAC_DEMUXER=yes
 CONFIG_DNXHD_DEMUXER=yes
 CONFIG_DSICIN_DEMUXER=yes
@@ -635,12 +688,16 @@
 CONFIG_FLV_DEMUXER=yes
 CONFIG_FOURXM_DEMUXER=yes
 CONFIG_G722_DEMUXER=yes
+CONFIG_G723_1_DEMUXER=yes
+CONFIG_G729_DEMUXER=yes
 CONFIG_GSM_DEMUXER=yes
 CONFIG_GXF_DEMUXER=yes
 CONFIG_H261_DEMUXER=yes
 CONFIG_H263_DEMUXER=yes
 CONFIG_H264_DEMUXER=yes
+CONFIG_ICO_DEMUXER=yes
 CONFIG_IDCIN_DEMUXER=yes
+CONFIG_IDF_DEMUXER=yes
 CONFIG_IFF_DEMUXER=yes
 CONFIG_IMAGE2_DEMUXER=yes
 CONFIG_IMAGE2PIPE_DEMUXER=yes
@@ -650,10 +707,13 @@
 CONFIG_IV8_DEMUXER=yes
 CONFIG_IVF_DEMUXER=yes
 CONFIG_JV_DEMUXER=yes
+CONFIG_LATM_DEMUXER=yes
 CONFIG_LMLM4_DEMUXER=yes
+CONFIG_LOAS_DEMUXER=yes
 CONFIG_LXF_DEMUXER=yes
 CONFIG_M4V_DEMUXER=yes
 CONFIG_MATROSKA_DEMUXER=yes
+CONFIG_MICRODVD_DEMUXER=yes
 CONFIG_MJPEG_DEMUXER=yes
 CONFIG_MLP_DEMUXER=yes
 CONFIG_MM_DEMUXER=yes
@@ -697,6 +757,7 @@
 CONFIG_PCM_U16BE_DEMUXER=yes
 CONFIG_PCM_U16LE_DEMUXER=yes
 CONFIG_PCM_U8_DEMUXER=yes
+CONFIG_PMP_DEMUXER=yes
 CONFIG_PVA_DEMUXER=yes
 CONFIG_QCP_DEMUXER=yes
 CONFIG_R3D_DEMUXER=yes
@@ -709,6 +770,7 @@
 CONFIG_RTP_DEMUXER=yes
 CONFIG_RTSP_DEMUXER=yes
 CONFIG_SAP_DEMUXER=yes
+CONFIG_SBG_DEMUXER=yes
 CONFIG_SDP_DEMUXER=yes
 CONFIG_SEGAFILM_DEMUXER=yes
 CONFIG_SHORTEN_DEMUXER=yes
@@ -740,14 +802,20 @@
 CONFIG_WTV_DEMUXER=yes
 CONFIG_WV_DEMUXER=yes
 CONFIG_XA_DEMUXER=yes
+CONFIG_XBIN_DEMUXER=yes
+CONFIG_XMV_DEMUXER=yes
+CONFIG_XWMA_DEMUXER=yes
 CONFIG_YOP_DEMUXER=yes
 CONFIG_YUV4MPEGPIPE_DEMUXER=yes
-CONFIG_=yes
+CONFIG_AVI_MUXER=yes
 CONFIG_APPLEHTTP_PROTOCOL=yes
+CONFIG_CACHE_PROTOCOL=yes
 CONFIG_CONCAT_PROTOCOL=yes
+CONFIG_CRYPTO_PROTOCOL=yes
 CONFIG_FILE_PROTOCOL=yes
 CONFIG_GOPHER_PROTOCOL=yes
 CONFIG_HTTP_PROTOCOL=yes
+CONFIG_HTTPPROXY_PROTOCOL=yes
 CONFIG_MMSH_PROTOCOL=yes
 CONFIG_MMST_PROTOCOL=yes
 CONFIG_MD5_PROTOCOL=yes
@@ -773,4 +841,6 @@
 CONFIG_NOISE_BSF=yes
 CONFIG_REMOVE_EXTRADATA_BSF=yes
 CONFIG_TEXT2MOVSUB_BSF=yes
+CONFIG_MPEG1_VDPAU_HWACCEL=yes
+CONFIG_MPEG2_VDPAU_HWACCEL=yes
 CONFIG_=yes