From 5878515c70f430ccbba17a880a211ff76325e03e Mon Sep 17 00:00:00 2001
From: Matt Oliver <protogonoi@gmail.com>
Date: Sun, 15 Oct 2017 21:34:15 +1100
Subject: [PATCH] projects: Update for recent upstream merge.

---
 SMP/config.asm            | 892 ++++++++++++++++++------------------
 SMP/config.h              | 934 +++++++++++++++++++-------------------
 SMP/libavutil/ffversion.h |   2 +-
 3 files changed, 916 insertions(+), 912 deletions(-)

diff --git a/SMP/config.asm b/SMP/config.asm
index ca21044c39..b54a598db1 100644
--- a/SMP/config.asm
+++ b/SMP/config.asm
@@ -253,6 +253,7 @@
 %define HAVE_MACHINE_IOCTL_METEOR_H 0
 %define HAVE_MALLOC_H 1
 %define HAVE_OPENCV2_CORE_CORE_C_H 0
+%define HAVE_OPENJPEG_2_3_OPENJPEG_H 0
 %define HAVE_OPENJPEG_2_2_OPENJPEG_H 0
 %define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
 %define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
@@ -443,24 +444,6 @@
 %define CONFIG_SCALING_VIDEO_EXAMPLE 0
 %define CONFIG_TRANSCODE_AAC_EXAMPLE 0
 %define CONFIG_TRANSCODING_EXAMPLE 0
-%define CONFIG_ALSA 0
-%define CONFIG_APPKIT 0
-%define CONFIG_AVFOUNDATION 0
-%define CONFIG_BZLIB 1
-%define CONFIG_COREIMAGE 0
-%define CONFIG_ICONV 1
-%define CONFIG_JACK 0
-%define CONFIG_LIBXCB 0
-%define CONFIG_LIBXCB_SHM 0
-%define CONFIG_LIBXCB_SHAPE 0
-%define CONFIG_LIBXCB_XFIXES 0
-%define CONFIG_LZMA 1
-%define CONFIG_SCHANNEL 0
-%define CONFIG_SDL2 1
-%define CONFIG_SECURETRANSPORT 0
-%define CONFIG_SNDIO 0
-%define CONFIG_XLIB 0
-%define CONFIG_ZLIB 1
 %define CONFIG_AVISYNTH 1
 %define CONFIG_FREI0R 0
 %define CONFIG_LIBCDIO 1
@@ -535,6 +518,29 @@
 %define CONFIG_OPENAL 0
 %define CONFIG_OPENCL 0
 %define CONFIG_OPENGL 1
+%define CONFIG_ALSA 0
+%define CONFIG_APPKIT 0
+%define CONFIG_AVFOUNDATION 0
+%define CONFIG_BZLIB 1
+%define CONFIG_COREIMAGE 0
+%define CONFIG_ICONV 1
+%define CONFIG_JACK 0
+%define CONFIG_LIBXCB 0
+%define CONFIG_LIBXCB_SHM 0
+%define CONFIG_LIBXCB_SHAPE 0
+%define CONFIG_LIBXCB_XFIXES 0
+%define CONFIG_LZMA 1
+%define CONFIG_SCHANNEL 0
+%define CONFIG_SDL2 1
+%define CONFIG_SECURETRANSPORT 0
+%define CONFIG_SNDIO 0
+%define CONFIG_XLIB 0
+%define CONFIG_ZLIB 1
+%define CONFIG_CUDA_SDK 0
+%define CONFIG_LIBNPP 0
+%define CONFIG_LIBMFX 1
+%define CONFIG_MMAL 0
+%define CONFIG_OMX 0
 %define CONFIG_AUDIOTOOLBOX 0
 %define CONFIG_CRYSTALHD 0
 %define CONFIG_CUDA 1
@@ -548,11 +554,6 @@
 %define CONFIG_VIDEOTOOLBOX 0
 %define CONFIG_V4L2_M2M 0
 %define CONFIG_XVMC 0
-%define CONFIG_CUDA_SDK 0
-%define CONFIG_LIBNPP 0
-%define CONFIG_LIBMFX 1
-%define CONFIG_MMAL 0
-%define CONFIG_OMX 0
 %define CONFIG_FTRAPV 0
 %define CONFIG_GRAY 0
 %define CONFIG_HARDCODED_TABLES 0
@@ -682,6 +683,7 @@
 %define CONFIG_TEXTUREDSP 1
 %define CONFIG_TEXTUREDSPENC 1
 %define CONFIG_TPELDSP 1
+%define CONFIG_VAAPI_1 0
 %define CONFIG_VAAPI_ENCODE 0
 %define CONFIG_VC1DSP 1
 %define CONFIG_VIDEODSP 1
@@ -1212,288 +1214,6 @@
 %define CONFIG_VP8_QSV_DECODER 1
 %define CONFIG_VP9_CUVID_DECODER 1
 %define CONFIG_VP9_MEDIACODEC_DECODER 0
-%define CONFIG_AA_DEMUXER 1
-%define CONFIG_AAC_DEMUXER 1
-%define CONFIG_AC3_DEMUXER 1
-%define CONFIG_ACM_DEMUXER 1
-%define CONFIG_ACT_DEMUXER 1
-%define CONFIG_ADF_DEMUXER 1
-%define CONFIG_ADP_DEMUXER 1
-%define CONFIG_ADS_DEMUXER 1
-%define CONFIG_ADX_DEMUXER 1
-%define CONFIG_AEA_DEMUXER 1
-%define CONFIG_AFC_DEMUXER 1
-%define CONFIG_AIFF_DEMUXER 1
-%define CONFIG_AIX_DEMUXER 1
-%define CONFIG_AMR_DEMUXER 1
-%define CONFIG_ANM_DEMUXER 1
-%define CONFIG_APC_DEMUXER 1
-%define CONFIG_APE_DEMUXER 1
-%define CONFIG_APNG_DEMUXER 1
-%define CONFIG_AQTITLE_DEMUXER 1
-%define CONFIG_ASF_DEMUXER 1
-%define CONFIG_ASF_O_DEMUXER 1
-%define CONFIG_ASS_DEMUXER 1
-%define CONFIG_AST_DEMUXER 1
-%define CONFIG_AU_DEMUXER 1
-%define CONFIG_AVI_DEMUXER 1
-%define CONFIG_AVISYNTH_DEMUXER 1
-%define CONFIG_AVR_DEMUXER 1
-%define CONFIG_AVS_DEMUXER 1
-%define CONFIG_BETHSOFTVID_DEMUXER 1
-%define CONFIG_BFI_DEMUXER 1
-%define CONFIG_BINTEXT_DEMUXER 1
-%define CONFIG_BINK_DEMUXER 1
-%define CONFIG_BIT_DEMUXER 1
-%define CONFIG_BMV_DEMUXER 1
-%define CONFIG_BFSTM_DEMUXER 1
-%define CONFIG_BRSTM_DEMUXER 1
-%define CONFIG_BOA_DEMUXER 1
-%define CONFIG_C93_DEMUXER 1
-%define CONFIG_CAF_DEMUXER 1
-%define CONFIG_CAVSVIDEO_DEMUXER 1
-%define CONFIG_CDG_DEMUXER 1
-%define CONFIG_CDXL_DEMUXER 1
-%define CONFIG_CINE_DEMUXER 1
-%define CONFIG_CONCAT_DEMUXER 1
-%define CONFIG_DASH_DEMUXER 1
-%define CONFIG_DATA_DEMUXER 1
-%define CONFIG_DAUD_DEMUXER 1
-%define CONFIG_DCSTR_DEMUXER 1
-%define CONFIG_DFA_DEMUXER 1
-%define CONFIG_DIRAC_DEMUXER 1
-%define CONFIG_DNXHD_DEMUXER 1
-%define CONFIG_DSF_DEMUXER 1
-%define CONFIG_DSICIN_DEMUXER 1
-%define CONFIG_DSS_DEMUXER 1
-%define CONFIG_DTS_DEMUXER 1
-%define CONFIG_DTSHD_DEMUXER 1
-%define CONFIG_DV_DEMUXER 1
-%define CONFIG_DVBSUB_DEMUXER 1
-%define CONFIG_DVBTXT_DEMUXER 1
-%define CONFIG_DXA_DEMUXER 1
-%define CONFIG_EA_DEMUXER 1
-%define CONFIG_EA_CDATA_DEMUXER 1
-%define CONFIG_EAC3_DEMUXER 1
-%define CONFIG_EPAF_DEMUXER 1
-%define CONFIG_FFM_DEMUXER 1
-%define CONFIG_FFMETADATA_DEMUXER 1
-%define CONFIG_FILMSTRIP_DEMUXER 1
-%define CONFIG_FITS_DEMUXER 1
-%define CONFIG_FLAC_DEMUXER 1
-%define CONFIG_FLIC_DEMUXER 1
-%define CONFIG_FLV_DEMUXER 1
-%define CONFIG_LIVE_FLV_DEMUXER 1
-%define CONFIG_FOURXM_DEMUXER 1
-%define CONFIG_FRM_DEMUXER 1
-%define CONFIG_FSB_DEMUXER 1
-%define CONFIG_G722_DEMUXER 1
-%define CONFIG_G723_1_DEMUXER 1
-%define CONFIG_G726_DEMUXER 1
-%define CONFIG_G726LE_DEMUXER 1
-%define CONFIG_G729_DEMUXER 1
-%define CONFIG_GDV_DEMUXER 1
-%define CONFIG_GENH_DEMUXER 1
-%define CONFIG_GIF_DEMUXER 1
-%define CONFIG_GSM_DEMUXER 1
-%define CONFIG_GXF_DEMUXER 1
-%define CONFIG_H261_DEMUXER 1
-%define CONFIG_H263_DEMUXER 1
-%define CONFIG_H264_DEMUXER 1
-%define CONFIG_HEVC_DEMUXER 1
-%define CONFIG_HLS_DEMUXER 1
-%define CONFIG_HNM_DEMUXER 1
-%define CONFIG_ICO_DEMUXER 1
-%define CONFIG_IDCIN_DEMUXER 1
-%define CONFIG_IDF_DEMUXER 1
-%define CONFIG_IFF_DEMUXER 1
-%define CONFIG_ILBC_DEMUXER 1
-%define CONFIG_IMAGE2_DEMUXER 1
-%define CONFIG_IMAGE2PIPE_DEMUXER 1
-%define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 1
-%define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 1
-%define CONFIG_INGENIENT_DEMUXER 1
-%define CONFIG_IPMOVIE_DEMUXER 1
-%define CONFIG_IRCAM_DEMUXER 1
-%define CONFIG_ISS_DEMUXER 1
-%define CONFIG_IV8_DEMUXER 1
-%define CONFIG_IVF_DEMUXER 1
-%define CONFIG_IVR_DEMUXER 1
-%define CONFIG_JACOSUB_DEMUXER 1
-%define CONFIG_JV_DEMUXER 1
-%define CONFIG_LMLM4_DEMUXER 1
-%define CONFIG_LOAS_DEMUXER 1
-%define CONFIG_LRC_DEMUXER 1
-%define CONFIG_LVF_DEMUXER 1
-%define CONFIG_LXF_DEMUXER 1
-%define CONFIG_M4V_DEMUXER 1
-%define CONFIG_MATROSKA_DEMUXER 1
-%define CONFIG_MGSTS_DEMUXER 1
-%define CONFIG_MICRODVD_DEMUXER 1
-%define CONFIG_MJPEG_DEMUXER 1
-%define CONFIG_MJPEG_2000_DEMUXER 1
-%define CONFIG_MLP_DEMUXER 1
-%define CONFIG_MLV_DEMUXER 1
-%define CONFIG_MM_DEMUXER 1
-%define CONFIG_MMF_DEMUXER 1
-%define CONFIG_MOV_DEMUXER 1
-%define CONFIG_MP3_DEMUXER 1
-%define CONFIG_MPC_DEMUXER 1
-%define CONFIG_MPC8_DEMUXER 1
-%define CONFIG_MPEGPS_DEMUXER 1
-%define CONFIG_MPEGTS_DEMUXER 1
-%define CONFIG_MPEGTSRAW_DEMUXER 1
-%define CONFIG_MPEGVIDEO_DEMUXER 1
-%define CONFIG_MPJPEG_DEMUXER 1
-%define CONFIG_MPL2_DEMUXER 1
-%define CONFIG_MPSUB_DEMUXER 1
-%define CONFIG_MSF_DEMUXER 1
-%define CONFIG_MSNWC_TCP_DEMUXER 1
-%define CONFIG_MTAF_DEMUXER 1
-%define CONFIG_MTV_DEMUXER 1
-%define CONFIG_MUSX_DEMUXER 1
-%define CONFIG_MV_DEMUXER 1
-%define CONFIG_MVI_DEMUXER 1
-%define CONFIG_MXF_DEMUXER 1
-%define CONFIG_MXG_DEMUXER 1
-%define CONFIG_NC_DEMUXER 1
-%define CONFIG_NISTSPHERE_DEMUXER 1
-%define CONFIG_NSV_DEMUXER 1
-%define CONFIG_NUT_DEMUXER 1
-%define CONFIG_NUV_DEMUXER 1
-%define CONFIG_OGG_DEMUXER 1
-%define CONFIG_OMA_DEMUXER 1
-%define CONFIG_PAF_DEMUXER 1
-%define CONFIG_PCM_ALAW_DEMUXER 1
-%define CONFIG_PCM_MULAW_DEMUXER 1
-%define CONFIG_PCM_F64BE_DEMUXER 1
-%define CONFIG_PCM_F64LE_DEMUXER 1
-%define CONFIG_PCM_F32BE_DEMUXER 1
-%define CONFIG_PCM_F32LE_DEMUXER 1
-%define CONFIG_PCM_S32BE_DEMUXER 1
-%define CONFIG_PCM_S32LE_DEMUXER 1
-%define CONFIG_PCM_S24BE_DEMUXER 1
-%define CONFIG_PCM_S24LE_DEMUXER 1
-%define CONFIG_PCM_S16BE_DEMUXER 1
-%define CONFIG_PCM_S16LE_DEMUXER 1
-%define CONFIG_PCM_S8_DEMUXER 1
-%define CONFIG_PCM_U32BE_DEMUXER 1
-%define CONFIG_PCM_U32LE_DEMUXER 1
-%define CONFIG_PCM_U24BE_DEMUXER 1
-%define CONFIG_PCM_U24LE_DEMUXER 1
-%define CONFIG_PCM_U16BE_DEMUXER 1
-%define CONFIG_PCM_U16LE_DEMUXER 1
-%define CONFIG_PCM_U8_DEMUXER 1
-%define CONFIG_PJS_DEMUXER 1
-%define CONFIG_PMP_DEMUXER 1
-%define CONFIG_PVA_DEMUXER 1
-%define CONFIG_PVF_DEMUXER 1
-%define CONFIG_QCP_DEMUXER 1
-%define CONFIG_R3D_DEMUXER 1
-%define CONFIG_RAWVIDEO_DEMUXER 1
-%define CONFIG_REALTEXT_DEMUXER 1
-%define CONFIG_REDSPARK_DEMUXER 1
-%define CONFIG_RL2_DEMUXER 1
-%define CONFIG_RM_DEMUXER 1
-%define CONFIG_ROQ_DEMUXER 1
-%define CONFIG_RPL_DEMUXER 1
-%define CONFIG_RSD_DEMUXER 1
-%define CONFIG_RSO_DEMUXER 1
-%define CONFIG_RTP_DEMUXER 1
-%define CONFIG_RTSP_DEMUXER 1
-%define CONFIG_S337M_DEMUXER 1
-%define CONFIG_SAMI_DEMUXER 1
-%define CONFIG_SAP_DEMUXER 1
-%define CONFIG_SBG_DEMUXER 1
-%define CONFIG_SCC_DEMUXER 1
-%define CONFIG_SDP_DEMUXER 1
-%define CONFIG_SDR2_DEMUXER 1
-%define CONFIG_SDS_DEMUXER 1
-%define CONFIG_SDX_DEMUXER 1
-%define CONFIG_SEGAFILM_DEMUXER 1
-%define CONFIG_SHORTEN_DEMUXER 1
-%define CONFIG_SIFF_DEMUXER 1
-%define CONFIG_SLN_DEMUXER 1
-%define CONFIG_SMACKER_DEMUXER 1
-%define CONFIG_SMJPEG_DEMUXER 1
-%define CONFIG_SMUSH_DEMUXER 1
-%define CONFIG_SOL_DEMUXER 1
-%define CONFIG_SOX_DEMUXER 1
-%define CONFIG_SPDIF_DEMUXER 1
-%define CONFIG_SRT_DEMUXER 1
-%define CONFIG_STR_DEMUXER 1
-%define CONFIG_STL_DEMUXER 1
-%define CONFIG_SUBVIEWER1_DEMUXER 1
-%define CONFIG_SUBVIEWER_DEMUXER 1
-%define CONFIG_SUP_DEMUXER 1
-%define CONFIG_SVAG_DEMUXER 1
-%define CONFIG_SWF_DEMUXER 1
-%define CONFIG_TAK_DEMUXER 1
-%define CONFIG_TEDCAPTIONS_DEMUXER 1
-%define CONFIG_THP_DEMUXER 1
-%define CONFIG_THREEDOSTR_DEMUXER 1
-%define CONFIG_TIERTEXSEQ_DEMUXER 1
-%define CONFIG_TMV_DEMUXER 1
-%define CONFIG_TRUEHD_DEMUXER 1
-%define CONFIG_TTA_DEMUXER 1
-%define CONFIG_TXD_DEMUXER 1
-%define CONFIG_TTY_DEMUXER 1
-%define CONFIG_V210_DEMUXER 1
-%define CONFIG_V210X_DEMUXER 1
-%define CONFIG_VAG_DEMUXER 1
-%define CONFIG_VC1_DEMUXER 1
-%define CONFIG_VC1T_DEMUXER 1
-%define CONFIG_VIVO_DEMUXER 1
-%define CONFIG_VMD_DEMUXER 1
-%define CONFIG_VOBSUB_DEMUXER 1
-%define CONFIG_VOC_DEMUXER 1
-%define CONFIG_VPK_DEMUXER 1
-%define CONFIG_VPLAYER_DEMUXER 1
-%define CONFIG_VQF_DEMUXER 1
-%define CONFIG_W64_DEMUXER 1
-%define CONFIG_WAV_DEMUXER 1
-%define CONFIG_WC3_DEMUXER 1
-%define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
-%define CONFIG_WEBVTT_DEMUXER 1
-%define CONFIG_WSAUD_DEMUXER 1
-%define CONFIG_WSD_DEMUXER 1
-%define CONFIG_WSVQA_DEMUXER 1
-%define CONFIG_WTV_DEMUXER 1
-%define CONFIG_WVE_DEMUXER 1
-%define CONFIG_WV_DEMUXER 1
-%define CONFIG_XA_DEMUXER 1
-%define CONFIG_XBIN_DEMUXER 1
-%define CONFIG_XMV_DEMUXER 1
-%define CONFIG_XVAG_DEMUXER 1
-%define CONFIG_XWMA_DEMUXER 1
-%define CONFIG_YOP_DEMUXER 1
-%define CONFIG_YUV4MPEGPIPE_DEMUXER 1
-%define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_DDS_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_PAM_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_PBM_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_PCX_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_PGM_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_PPM_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_PSD_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_SVG_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
-%define CONFIG_IMAGE_XPM_PIPE_DEMUXER 1
-%define CONFIG_LIBGME_DEMUXER 1
-%define CONFIG_LIBMODPLUG_DEMUXER 1
-%define CONFIG_LIBOPENMPT_DEMUXER 0
 %define CONFIG_A64MULTI_ENCODER 1
 %define CONFIG_A64MULTI5_ENCODER 1
 %define CONFIG_ALIAS_PIX_ENCODER 1
@@ -1696,6 +1416,146 @@
 %define CONFIG_VP8_V4L2M2M_ENCODER 0
 %define CONFIG_VP8_VAAPI_ENCODER 0
 %define CONFIG_VP9_VAAPI_ENCODER 0
+%define CONFIG_H263_VAAPI_HWACCEL 0
+%define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_H264_CUVID_HWACCEL 1
+%define CONFIG_H264_D3D11VA_HWACCEL 1
+%define CONFIG_H264_D3D11VA2_HWACCEL 1
+%define CONFIG_H264_DXVA2_HWACCEL 1
+%define CONFIG_H264_MEDIACODEC_HWACCEL 0
+%define CONFIG_H264_MMAL_HWACCEL 0
+%define CONFIG_H264_QSV_HWACCEL 1
+%define CONFIG_H264_VAAPI_HWACCEL 0
+%define CONFIG_H264_VDA_HWACCEL 0
+%define CONFIG_H264_VDA_OLD_HWACCEL 0
+%define CONFIG_H264_VDPAU_HWACCEL 0
+%define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_HEVC_CUVID_HWACCEL 1
+%define CONFIG_HEVC_D3D11VA_HWACCEL 1
+%define CONFIG_HEVC_D3D11VA2_HWACCEL 1
+%define CONFIG_HEVC_DXVA2_HWACCEL 1
+%define CONFIG_HEVC_MEDIACODEC_HWACCEL 0
+%define CONFIG_HEVC_QSV_HWACCEL 1
+%define CONFIG_HEVC_VAAPI_HWACCEL 0
+%define CONFIG_HEVC_VDPAU_HWACCEL 0
+%define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_MJPEG_CUVID_HWACCEL 1
+%define CONFIG_MPEG1_CUVID_HWACCEL 1
+%define CONFIG_MPEG1_XVMC_HWACCEL 0
+%define CONFIG_MPEG1_VDPAU_HWACCEL 0
+%define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_MPEG2_CUVID_HWACCEL 1
+%define CONFIG_MPEG2_XVMC_HWACCEL 0
+%define CONFIG_MPEG2_D3D11VA_HWACCEL 1
+%define CONFIG_MPEG2_D3D11VA2_HWACCEL 1
+%define CONFIG_MPEG2_DXVA2_HWACCEL 1
+%define CONFIG_MPEG2_MMAL_HWACCEL 0
+%define CONFIG_MPEG2_QSV_HWACCEL 1
+%define CONFIG_MPEG2_VAAPI_HWACCEL 0
+%define CONFIG_MPEG2_VDPAU_HWACCEL 0
+%define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_MPEG2_MEDIACODEC_HWACCEL 0
+%define CONFIG_MPEG4_CUVID_HWACCEL 1
+%define CONFIG_MPEG4_MEDIACODEC_HWACCEL 0
+%define CONFIG_MPEG4_MMAL_HWACCEL 0
+%define CONFIG_MPEG4_VAAPI_HWACCEL 0
+%define CONFIG_MPEG4_VDPAU_HWACCEL 0
+%define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
+%define CONFIG_VC1_CUVID_HWACCEL 1
+%define CONFIG_VC1_D3D11VA_HWACCEL 1
+%define CONFIG_VC1_D3D11VA2_HWACCEL 1
+%define CONFIG_VC1_DXVA2_HWACCEL 1
+%define CONFIG_VC1_VAAPI_HWACCEL 0
+%define CONFIG_VC1_VDPAU_HWACCEL 0
+%define CONFIG_VC1_MMAL_HWACCEL 0
+%define CONFIG_VC1_QSV_HWACCEL 1
+%define CONFIG_VP8_CUVID_HWACCEL 1
+%define CONFIG_VP8_MEDIACODEC_HWACCEL 0
+%define CONFIG_VP8_QSV_HWACCEL 1
+%define CONFIG_VP9_CUVID_HWACCEL 1
+%define CONFIG_VP9_D3D11VA_HWACCEL 1
+%define CONFIG_VP9_D3D11VA2_HWACCEL 1
+%define CONFIG_VP9_DXVA2_HWACCEL 1
+%define CONFIG_VP9_MEDIACODEC_HWACCEL 0
+%define CONFIG_VP9_VAAPI_HWACCEL 0
+%define CONFIG_WMV3_D3D11VA_HWACCEL 1
+%define CONFIG_WMV3_D3D11VA2_HWACCEL 1
+%define CONFIG_WMV3_DXVA2_HWACCEL 1
+%define CONFIG_WMV3_VAAPI_HWACCEL 0
+%define CONFIG_WMV3_VDPAU_HWACCEL 0
+%define CONFIG_AAC_PARSER 1
+%define CONFIG_AAC_LATM_PARSER 1
+%define CONFIG_AC3_PARSER 1
+%define CONFIG_ADX_PARSER 1
+%define CONFIG_BMP_PARSER 1
+%define CONFIG_CAVSVIDEO_PARSER 1
+%define CONFIG_COOK_PARSER 1
+%define CONFIG_DCA_PARSER 1
+%define CONFIG_DIRAC_PARSER 1
+%define CONFIG_DNXHD_PARSER 1
+%define CONFIG_DPX_PARSER 1
+%define CONFIG_DVAUDIO_PARSER 1
+%define CONFIG_DVBSUB_PARSER 1
+%define CONFIG_DVDSUB_PARSER 1
+%define CONFIG_DVD_NAV_PARSER 1
+%define CONFIG_FLAC_PARSER 1
+%define CONFIG_G729_PARSER 1
+%define CONFIG_GSM_PARSER 1
+%define CONFIG_H261_PARSER 1
+%define CONFIG_H263_PARSER 1
+%define CONFIG_H264_PARSER 1
+%define CONFIG_HEVC_PARSER 1
+%define CONFIG_MJPEG_PARSER 1
+%define CONFIG_MLP_PARSER 1
+%define CONFIG_MPEG4VIDEO_PARSER 1
+%define CONFIG_MPEGAUDIO_PARSER 1
+%define CONFIG_MPEGVIDEO_PARSER 1
+%define CONFIG_OPUS_PARSER 1
+%define CONFIG_PNG_PARSER 1
+%define CONFIG_PNM_PARSER 1
+%define CONFIG_RV30_PARSER 1
+%define CONFIG_RV40_PARSER 1
+%define CONFIG_SIPR_PARSER 1
+%define CONFIG_TAK_PARSER 1
+%define CONFIG_VC1_PARSER 1
+%define CONFIG_VORBIS_PARSER 1
+%define CONFIG_VP3_PARSER 1
+%define CONFIG_VP8_PARSER 1
+%define CONFIG_VP9_PARSER 1
+%define CONFIG_XMA_PARSER 1
+%define CONFIG_ALSA_INDEV 0
+%define CONFIG_AVFOUNDATION_INDEV 0
+%define CONFIG_BKTR_INDEV 0
+%define CONFIG_DECKLINK_INDEV 0
+%define CONFIG_LIBNDI_NEWTEK_INDEV 0
+%define CONFIG_DSHOW_INDEV 1
+%define CONFIG_FBDEV_INDEV 0
+%define CONFIG_GDIGRAB_INDEV 1
+%define CONFIG_IEC61883_INDEV 0
+%define CONFIG_JACK_INDEV 0
+%define CONFIG_KMSGRAB_INDEV 0
+%define CONFIG_LAVFI_INDEV 1
+%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 1
+%define CONFIG_XCBGRAB_INDEV 0
+%define CONFIG_LIBCDIO_INDEV 1
+%define CONFIG_LIBDC1394_INDEV 0
+%define CONFIG_ALSA_OUTDEV 0
+%define CONFIG_CACA_OUTDEV 0
+%define CONFIG_DECKLINK_OUTDEV 0
+%define CONFIG_LIBNDI_NEWTEK_OUTDEV 0
+%define CONFIG_FBDEV_OUTDEV 0
+%define CONFIG_OPENGL_OUTDEV 1
+%define CONFIG_OSS_OUTDEV 0
+%define CONFIG_PULSE_OUTDEV 0
+%define CONFIG_SDL2_OUTDEV 1
+%define CONFIG_SNDIO_OUTDEV 0
+%define CONFIG_V4L2_OUTDEV 0
+%define CONFIG_XV_OUTDEV 0
 %define CONFIG_ABENCH_FILTER 1
 %define CONFIG_ACOMPRESSOR_FILTER 1
 %define CONFIG_ACOPY_FILTER 1
@@ -2039,94 +1899,288 @@
 %define CONFIG_SPECTRUMSYNTH_FILTER 1
 %define CONFIG_AMOVIE_FILTER 1
 %define CONFIG_MOVIE_FILTER 1
-%define CONFIG_H263_VAAPI_HWACCEL 0
-%define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
-%define CONFIG_H264_CUVID_HWACCEL 1
-%define CONFIG_H264_D3D11VA_HWACCEL 1
-%define CONFIG_H264_D3D11VA2_HWACCEL 1
-%define CONFIG_H264_DXVA2_HWACCEL 1
-%define CONFIG_H264_MEDIACODEC_HWACCEL 0
-%define CONFIG_H264_MMAL_HWACCEL 0
-%define CONFIG_H264_QSV_HWACCEL 1
-%define CONFIG_H264_VAAPI_HWACCEL 0
-%define CONFIG_H264_VDA_HWACCEL 0
-%define CONFIG_H264_VDA_OLD_HWACCEL 0
-%define CONFIG_H264_VDPAU_HWACCEL 0
-%define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
-%define CONFIG_HEVC_CUVID_HWACCEL 1
-%define CONFIG_HEVC_D3D11VA_HWACCEL 1
-%define CONFIG_HEVC_D3D11VA2_HWACCEL 1
-%define CONFIG_HEVC_DXVA2_HWACCEL 1
-%define CONFIG_HEVC_MEDIACODEC_HWACCEL 0
-%define CONFIG_HEVC_QSV_HWACCEL 1
-%define CONFIG_HEVC_VAAPI_HWACCEL 0
-%define CONFIG_HEVC_VDPAU_HWACCEL 0
-%define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
-%define CONFIG_MJPEG_CUVID_HWACCEL 1
-%define CONFIG_MPEG1_CUVID_HWACCEL 1
-%define CONFIG_MPEG1_XVMC_HWACCEL 0
-%define CONFIG_MPEG1_VDPAU_HWACCEL 0
-%define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
-%define CONFIG_MPEG2_CUVID_HWACCEL 1
-%define CONFIG_MPEG2_XVMC_HWACCEL 0
-%define CONFIG_MPEG2_D3D11VA_HWACCEL 1
-%define CONFIG_MPEG2_D3D11VA2_HWACCEL 1
-%define CONFIG_MPEG2_DXVA2_HWACCEL 1
-%define CONFIG_MPEG2_MMAL_HWACCEL 0
-%define CONFIG_MPEG2_QSV_HWACCEL 1
-%define CONFIG_MPEG2_VAAPI_HWACCEL 0
-%define CONFIG_MPEG2_VDPAU_HWACCEL 0
-%define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
-%define CONFIG_MPEG2_MEDIACODEC_HWACCEL 0
-%define CONFIG_MPEG4_CUVID_HWACCEL 1
-%define CONFIG_MPEG4_MEDIACODEC_HWACCEL 0
-%define CONFIG_MPEG4_MMAL_HWACCEL 0
-%define CONFIG_MPEG4_VAAPI_HWACCEL 0
-%define CONFIG_MPEG4_VDPAU_HWACCEL 0
-%define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
-%define CONFIG_VC1_CUVID_HWACCEL 1
-%define CONFIG_VC1_D3D11VA_HWACCEL 1
-%define CONFIG_VC1_D3D11VA2_HWACCEL 1
-%define CONFIG_VC1_DXVA2_HWACCEL 1
-%define CONFIG_VC1_VAAPI_HWACCEL 0
-%define CONFIG_VC1_VDPAU_HWACCEL 0
-%define CONFIG_VC1_MMAL_HWACCEL 0
-%define CONFIG_VC1_QSV_HWACCEL 1
-%define CONFIG_VP8_CUVID_HWACCEL 1
-%define CONFIG_VP8_MEDIACODEC_HWACCEL 0
-%define CONFIG_VP8_QSV_HWACCEL 1
-%define CONFIG_VP9_CUVID_HWACCEL 1
-%define CONFIG_VP9_D3D11VA_HWACCEL 1
-%define CONFIG_VP9_D3D11VA2_HWACCEL 1
-%define CONFIG_VP9_DXVA2_HWACCEL 1
-%define CONFIG_VP9_MEDIACODEC_HWACCEL 0
-%define CONFIG_VP9_VAAPI_HWACCEL 0
-%define CONFIG_WMV3_D3D11VA_HWACCEL 1
-%define CONFIG_WMV3_D3D11VA2_HWACCEL 1
-%define CONFIG_WMV3_DXVA2_HWACCEL 1
-%define CONFIG_WMV3_VAAPI_HWACCEL 0
-%define CONFIG_WMV3_VDPAU_HWACCEL 0
-%define CONFIG_ALSA_INDEV 0
-%define CONFIG_AVFOUNDATION_INDEV 0
-%define CONFIG_BKTR_INDEV 0
-%define CONFIG_DECKLINK_INDEV 0
-%define CONFIG_LIBNDI_NEWTEK_INDEV 0
-%define CONFIG_DSHOW_INDEV 1
-%define CONFIG_FBDEV_INDEV 0
-%define CONFIG_GDIGRAB_INDEV 1
-%define CONFIG_IEC61883_INDEV 0
-%define CONFIG_JACK_INDEV 0
-%define CONFIG_KMSGRAB_INDEV 0
-%define CONFIG_LAVFI_INDEV 1
-%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 1
-%define CONFIG_XCBGRAB_INDEV 0
-%define CONFIG_LIBCDIO_INDEV 1
-%define CONFIG_LIBDC1394_INDEV 0
+%define CONFIG_AA_DEMUXER 1
+%define CONFIG_AAC_DEMUXER 1
+%define CONFIG_AC3_DEMUXER 1
+%define CONFIG_ACM_DEMUXER 1
+%define CONFIG_ACT_DEMUXER 1
+%define CONFIG_ADF_DEMUXER 1
+%define CONFIG_ADP_DEMUXER 1
+%define CONFIG_ADS_DEMUXER 1
+%define CONFIG_ADX_DEMUXER 1
+%define CONFIG_AEA_DEMUXER 1
+%define CONFIG_AFC_DEMUXER 1
+%define CONFIG_AIFF_DEMUXER 1
+%define CONFIG_AIX_DEMUXER 1
+%define CONFIG_AMR_DEMUXER 1
+%define CONFIG_ANM_DEMUXER 1
+%define CONFIG_APC_DEMUXER 1
+%define CONFIG_APE_DEMUXER 1
+%define CONFIG_APNG_DEMUXER 1
+%define CONFIG_AQTITLE_DEMUXER 1
+%define CONFIG_ASF_DEMUXER 1
+%define CONFIG_ASF_O_DEMUXER 1
+%define CONFIG_ASS_DEMUXER 1
+%define CONFIG_AST_DEMUXER 1
+%define CONFIG_AU_DEMUXER 1
+%define CONFIG_AVI_DEMUXER 1
+%define CONFIG_AVISYNTH_DEMUXER 1
+%define CONFIG_AVR_DEMUXER 1
+%define CONFIG_AVS_DEMUXER 1
+%define CONFIG_BETHSOFTVID_DEMUXER 1
+%define CONFIG_BFI_DEMUXER 1
+%define CONFIG_BINTEXT_DEMUXER 1
+%define CONFIG_BINK_DEMUXER 1
+%define CONFIG_BIT_DEMUXER 1
+%define CONFIG_BMV_DEMUXER 1
+%define CONFIG_BFSTM_DEMUXER 1
+%define CONFIG_BRSTM_DEMUXER 1
+%define CONFIG_BOA_DEMUXER 1
+%define CONFIG_C93_DEMUXER 1
+%define CONFIG_CAF_DEMUXER 1
+%define CONFIG_CAVSVIDEO_DEMUXER 1
+%define CONFIG_CDG_DEMUXER 1
+%define CONFIG_CDXL_DEMUXER 1
+%define CONFIG_CINE_DEMUXER 1
+%define CONFIG_CONCAT_DEMUXER 1
+%define CONFIG_DASH_DEMUXER 1
+%define CONFIG_DATA_DEMUXER 1
+%define CONFIG_DAUD_DEMUXER 1
+%define CONFIG_DCSTR_DEMUXER 1
+%define CONFIG_DFA_DEMUXER 1
+%define CONFIG_DIRAC_DEMUXER 1
+%define CONFIG_DNXHD_DEMUXER 1
+%define CONFIG_DSF_DEMUXER 1
+%define CONFIG_DSICIN_DEMUXER 1
+%define CONFIG_DSS_DEMUXER 1
+%define CONFIG_DTS_DEMUXER 1
+%define CONFIG_DTSHD_DEMUXER 1
+%define CONFIG_DV_DEMUXER 1
+%define CONFIG_DVBSUB_DEMUXER 1
+%define CONFIG_DVBTXT_DEMUXER 1
+%define CONFIG_DXA_DEMUXER 1
+%define CONFIG_EA_DEMUXER 1
+%define CONFIG_EA_CDATA_DEMUXER 1
+%define CONFIG_EAC3_DEMUXER 1
+%define CONFIG_EPAF_DEMUXER 1
+%define CONFIG_FFM_DEMUXER 1
+%define CONFIG_FFMETADATA_DEMUXER 1
+%define CONFIG_FILMSTRIP_DEMUXER 1
+%define CONFIG_FITS_DEMUXER 1
+%define CONFIG_FLAC_DEMUXER 1
+%define CONFIG_FLIC_DEMUXER 1
+%define CONFIG_FLV_DEMUXER 1
+%define CONFIG_LIVE_FLV_DEMUXER 1
+%define CONFIG_FOURXM_DEMUXER 1
+%define CONFIG_FRM_DEMUXER 1
+%define CONFIG_FSB_DEMUXER 1
+%define CONFIG_G722_DEMUXER 1
+%define CONFIG_G723_1_DEMUXER 1
+%define CONFIG_G726_DEMUXER 1
+%define CONFIG_G726LE_DEMUXER 1
+%define CONFIG_G729_DEMUXER 1
+%define CONFIG_GDV_DEMUXER 1
+%define CONFIG_GENH_DEMUXER 1
+%define CONFIG_GIF_DEMUXER 1
+%define CONFIG_GSM_DEMUXER 1
+%define CONFIG_GXF_DEMUXER 1
+%define CONFIG_H261_DEMUXER 1
+%define CONFIG_H263_DEMUXER 1
+%define CONFIG_H264_DEMUXER 1
+%define CONFIG_HEVC_DEMUXER 1
+%define CONFIG_HLS_DEMUXER 1
+%define CONFIG_HNM_DEMUXER 1
+%define CONFIG_ICO_DEMUXER 1
+%define CONFIG_IDCIN_DEMUXER 1
+%define CONFIG_IDF_DEMUXER 1
+%define CONFIG_IFF_DEMUXER 1
+%define CONFIG_ILBC_DEMUXER 1
+%define CONFIG_IMAGE2_DEMUXER 1
+%define CONFIG_IMAGE2PIPE_DEMUXER 1
+%define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 1
+%define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 1
+%define CONFIG_INGENIENT_DEMUXER 1
+%define CONFIG_IPMOVIE_DEMUXER 1
+%define CONFIG_IRCAM_DEMUXER 1
+%define CONFIG_ISS_DEMUXER 1
+%define CONFIG_IV8_DEMUXER 1
+%define CONFIG_IVF_DEMUXER 1
+%define CONFIG_IVR_DEMUXER 1
+%define CONFIG_JACOSUB_DEMUXER 1
+%define CONFIG_JV_DEMUXER 1
+%define CONFIG_LMLM4_DEMUXER 1
+%define CONFIG_LOAS_DEMUXER 1
+%define CONFIG_LRC_DEMUXER 1
+%define CONFIG_LVF_DEMUXER 1
+%define CONFIG_LXF_DEMUXER 1
+%define CONFIG_M4V_DEMUXER 1
+%define CONFIG_MATROSKA_DEMUXER 1
+%define CONFIG_MGSTS_DEMUXER 1
+%define CONFIG_MICRODVD_DEMUXER 1
+%define CONFIG_MJPEG_DEMUXER 1
+%define CONFIG_MJPEG_2000_DEMUXER 1
+%define CONFIG_MLP_DEMUXER 1
+%define CONFIG_MLV_DEMUXER 1
+%define CONFIG_MM_DEMUXER 1
+%define CONFIG_MMF_DEMUXER 1
+%define CONFIG_MOV_DEMUXER 1
+%define CONFIG_MP3_DEMUXER 1
+%define CONFIG_MPC_DEMUXER 1
+%define CONFIG_MPC8_DEMUXER 1
+%define CONFIG_MPEGPS_DEMUXER 1
+%define CONFIG_MPEGTS_DEMUXER 1
+%define CONFIG_MPEGTSRAW_DEMUXER 1
+%define CONFIG_MPEGVIDEO_DEMUXER 1
+%define CONFIG_MPJPEG_DEMUXER 1
+%define CONFIG_MPL2_DEMUXER 1
+%define CONFIG_MPSUB_DEMUXER 1
+%define CONFIG_MSF_DEMUXER 1
+%define CONFIG_MSNWC_TCP_DEMUXER 1
+%define CONFIG_MTAF_DEMUXER 1
+%define CONFIG_MTV_DEMUXER 1
+%define CONFIG_MUSX_DEMUXER 1
+%define CONFIG_MV_DEMUXER 1
+%define CONFIG_MVI_DEMUXER 1
+%define CONFIG_MXF_DEMUXER 1
+%define CONFIG_MXG_DEMUXER 1
+%define CONFIG_NC_DEMUXER 1
+%define CONFIG_NISTSPHERE_DEMUXER 1
+%define CONFIG_NSV_DEMUXER 1
+%define CONFIG_NUT_DEMUXER 1
+%define CONFIG_NUV_DEMUXER 1
+%define CONFIG_OGG_DEMUXER 1
+%define CONFIG_OMA_DEMUXER 1
+%define CONFIG_PAF_DEMUXER 1
+%define CONFIG_PCM_ALAW_DEMUXER 1
+%define CONFIG_PCM_MULAW_DEMUXER 1
+%define CONFIG_PCM_F64BE_DEMUXER 1
+%define CONFIG_PCM_F64LE_DEMUXER 1
+%define CONFIG_PCM_F32BE_DEMUXER 1
+%define CONFIG_PCM_F32LE_DEMUXER 1
+%define CONFIG_PCM_S32BE_DEMUXER 1
+%define CONFIG_PCM_S32LE_DEMUXER 1
+%define CONFIG_PCM_S24BE_DEMUXER 1
+%define CONFIG_PCM_S24LE_DEMUXER 1
+%define CONFIG_PCM_S16BE_DEMUXER 1
+%define CONFIG_PCM_S16LE_DEMUXER 1
+%define CONFIG_PCM_S8_DEMUXER 1
+%define CONFIG_PCM_U32BE_DEMUXER 1
+%define CONFIG_PCM_U32LE_DEMUXER 1
+%define CONFIG_PCM_U24BE_DEMUXER 1
+%define CONFIG_PCM_U24LE_DEMUXER 1
+%define CONFIG_PCM_U16BE_DEMUXER 1
+%define CONFIG_PCM_U16LE_DEMUXER 1
+%define CONFIG_PCM_U8_DEMUXER 1
+%define CONFIG_PJS_DEMUXER 1
+%define CONFIG_PMP_DEMUXER 1
+%define CONFIG_PVA_DEMUXER 1
+%define CONFIG_PVF_DEMUXER 1
+%define CONFIG_QCP_DEMUXER 1
+%define CONFIG_R3D_DEMUXER 1
+%define CONFIG_RAWVIDEO_DEMUXER 1
+%define CONFIG_REALTEXT_DEMUXER 1
+%define CONFIG_REDSPARK_DEMUXER 1
+%define CONFIG_RL2_DEMUXER 1
+%define CONFIG_RM_DEMUXER 1
+%define CONFIG_ROQ_DEMUXER 1
+%define CONFIG_RPL_DEMUXER 1
+%define CONFIG_RSD_DEMUXER 1
+%define CONFIG_RSO_DEMUXER 1
+%define CONFIG_RTP_DEMUXER 1
+%define CONFIG_RTSP_DEMUXER 1
+%define CONFIG_S337M_DEMUXER 1
+%define CONFIG_SAMI_DEMUXER 1
+%define CONFIG_SAP_DEMUXER 1
+%define CONFIG_SBG_DEMUXER 1
+%define CONFIG_SCC_DEMUXER 1
+%define CONFIG_SDP_DEMUXER 1
+%define CONFIG_SDR2_DEMUXER 1
+%define CONFIG_SDS_DEMUXER 1
+%define CONFIG_SDX_DEMUXER 1
+%define CONFIG_SEGAFILM_DEMUXER 1
+%define CONFIG_SHORTEN_DEMUXER 1
+%define CONFIG_SIFF_DEMUXER 1
+%define CONFIG_SLN_DEMUXER 1
+%define CONFIG_SMACKER_DEMUXER 1
+%define CONFIG_SMJPEG_DEMUXER 1
+%define CONFIG_SMUSH_DEMUXER 1
+%define CONFIG_SOL_DEMUXER 1
+%define CONFIG_SOX_DEMUXER 1
+%define CONFIG_SPDIF_DEMUXER 1
+%define CONFIG_SRT_DEMUXER 1
+%define CONFIG_STR_DEMUXER 1
+%define CONFIG_STL_DEMUXER 1
+%define CONFIG_SUBVIEWER1_DEMUXER 1
+%define CONFIG_SUBVIEWER_DEMUXER 1
+%define CONFIG_SUP_DEMUXER 1
+%define CONFIG_SVAG_DEMUXER 1
+%define CONFIG_SWF_DEMUXER 1
+%define CONFIG_TAK_DEMUXER 1
+%define CONFIG_TEDCAPTIONS_DEMUXER 1
+%define CONFIG_THP_DEMUXER 1
+%define CONFIG_THREEDOSTR_DEMUXER 1
+%define CONFIG_TIERTEXSEQ_DEMUXER 1
+%define CONFIG_TMV_DEMUXER 1
+%define CONFIG_TRUEHD_DEMUXER 1
+%define CONFIG_TTA_DEMUXER 1
+%define CONFIG_TXD_DEMUXER 1
+%define CONFIG_TTY_DEMUXER 1
+%define CONFIG_V210_DEMUXER 1
+%define CONFIG_V210X_DEMUXER 1
+%define CONFIG_VAG_DEMUXER 1
+%define CONFIG_VC1_DEMUXER 1
+%define CONFIG_VC1T_DEMUXER 1
+%define CONFIG_VIVO_DEMUXER 1
+%define CONFIG_VMD_DEMUXER 1
+%define CONFIG_VOBSUB_DEMUXER 1
+%define CONFIG_VOC_DEMUXER 1
+%define CONFIG_VPK_DEMUXER 1
+%define CONFIG_VPLAYER_DEMUXER 1
+%define CONFIG_VQF_DEMUXER 1
+%define CONFIG_W64_DEMUXER 1
+%define CONFIG_WAV_DEMUXER 1
+%define CONFIG_WC3_DEMUXER 1
+%define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
+%define CONFIG_WEBVTT_DEMUXER 1
+%define CONFIG_WSAUD_DEMUXER 1
+%define CONFIG_WSD_DEMUXER 1
+%define CONFIG_WSVQA_DEMUXER 1
+%define CONFIG_WTV_DEMUXER 1
+%define CONFIG_WVE_DEMUXER 1
+%define CONFIG_WV_DEMUXER 1
+%define CONFIG_XA_DEMUXER 1
+%define CONFIG_XBIN_DEMUXER 1
+%define CONFIG_XMV_DEMUXER 1
+%define CONFIG_XVAG_DEMUXER 1
+%define CONFIG_XWMA_DEMUXER 1
+%define CONFIG_YOP_DEMUXER 1
+%define CONFIG_YUV4MPEGPIPE_DEMUXER 1
+%define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_DDS_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PAM_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PBM_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PCX_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PGM_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PPM_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_PSD_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_SVG_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
+%define CONFIG_IMAGE_XPM_PIPE_DEMUXER 1
+%define CONFIG_LIBGME_DEMUXER 1
+%define CONFIG_LIBMODPLUG_DEMUXER 1
+%define CONFIG_LIBOPENMPT_DEMUXER 0
 %define CONFIG_A64_MUXER 1
 %define CONFIG_AC3_MUXER 1
 %define CONFIG_ADTS_MUXER 1
@@ -2282,58 +2336,6 @@
 %define CONFIG_WV_MUXER 1
 %define CONFIG_YUV4MPEGPIPE_MUXER 1
 %define CONFIG_CHROMAPRINT_MUXER 0
-%define CONFIG_ALSA_OUTDEV 0
-%define CONFIG_CACA_OUTDEV 0
-%define CONFIG_DECKLINK_OUTDEV 0
-%define CONFIG_LIBNDI_NEWTEK_OUTDEV 0
-%define CONFIG_FBDEV_OUTDEV 0
-%define CONFIG_OPENGL_OUTDEV 1
-%define CONFIG_OSS_OUTDEV 0
-%define CONFIG_PULSE_OUTDEV 0
-%define CONFIG_SDL2_OUTDEV 1
-%define CONFIG_SNDIO_OUTDEV 0
-%define CONFIG_V4L2_OUTDEV 0
-%define CONFIG_XV_OUTDEV 0
-%define CONFIG_AAC_PARSER 1
-%define CONFIG_AAC_LATM_PARSER 1
-%define CONFIG_AC3_PARSER 1
-%define CONFIG_ADX_PARSER 1
-%define CONFIG_BMP_PARSER 1
-%define CONFIG_CAVSVIDEO_PARSER 1
-%define CONFIG_COOK_PARSER 1
-%define CONFIG_DCA_PARSER 1
-%define CONFIG_DIRAC_PARSER 1
-%define CONFIG_DNXHD_PARSER 1
-%define CONFIG_DPX_PARSER 1
-%define CONFIG_DVAUDIO_PARSER 1
-%define CONFIG_DVBSUB_PARSER 1
-%define CONFIG_DVDSUB_PARSER 1
-%define CONFIG_DVD_NAV_PARSER 1
-%define CONFIG_FLAC_PARSER 1
-%define CONFIG_G729_PARSER 1
-%define CONFIG_GSM_PARSER 1
-%define CONFIG_H261_PARSER 1
-%define CONFIG_H263_PARSER 1
-%define CONFIG_H264_PARSER 1
-%define CONFIG_HEVC_PARSER 1
-%define CONFIG_MJPEG_PARSER 1
-%define CONFIG_MLP_PARSER 1
-%define CONFIG_MPEG4VIDEO_PARSER 1
-%define CONFIG_MPEGAUDIO_PARSER 1
-%define CONFIG_MPEGVIDEO_PARSER 1
-%define CONFIG_OPUS_PARSER 1
-%define CONFIG_PNG_PARSER 1
-%define CONFIG_PNM_PARSER 1
-%define CONFIG_RV30_PARSER 1
-%define CONFIG_RV40_PARSER 1
-%define CONFIG_SIPR_PARSER 1
-%define CONFIG_TAK_PARSER 1
-%define CONFIG_VC1_PARSER 1
-%define CONFIG_VORBIS_PARSER 1
-%define CONFIG_VP3_PARSER 1
-%define CONFIG_VP8_PARSER 1
-%define CONFIG_VP9_PARSER 1
-%define CONFIG_XMA_PARSER 1
 %define CONFIG_ASYNC_PROTOCOL 1
 %define CONFIG_BLURAY_PROTOCOL 1
 %define CONFIG_CACHE_PROTOCOL 1
diff --git a/SMP/config.h b/SMP/config.h
index c70c5dd2c2..45a37d6a3d 100644
--- a/SMP/config.h
+++ b/SMP/config.h
@@ -283,6 +283,7 @@
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
 #define HAVE_MALLOC_H 1
 #define HAVE_OPENCV2_CORE_CORE_C_H 0
+#define HAVE_OPENJPEG_2_3_OPENJPEG_H 0
 #define HAVE_OPENJPEG_2_2_OPENJPEG_H 0
 #define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
 #define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
@@ -485,24 +486,6 @@
 #define CONFIG_SCALING_VIDEO_EXAMPLE 0
 #define CONFIG_TRANSCODE_AAC_EXAMPLE 0
 #define CONFIG_TRANSCODING_EXAMPLE 0
-#define CONFIG_ALSA 0
-#define CONFIG_APPKIT 0
-#define CONFIG_AVFOUNDATION 0
-#define CONFIG_BZLIB 1
-#define CONFIG_COREIMAGE 0
-#define CONFIG_ICONV 1
-#define CONFIG_JACK 0
-#define CONFIG_LIBXCB 0
-#define CONFIG_LIBXCB_SHM 0
-#define CONFIG_LIBXCB_SHAPE 0
-#define CONFIG_LIBXCB_XFIXES 0
-#define CONFIG_LZMA 1
-#define CONFIG_SCHANNEL 0
-#define CONFIG_SDL2 1
-#define CONFIG_SECURETRANSPORT 0
-#define CONFIG_SNDIO 0
-#define CONFIG_XLIB 0
-#define CONFIG_ZLIB 1
 #define CONFIG_AVISYNTH 1
 #define CONFIG_FREI0R 0
 #define CONFIG_LIBCDIO 1
@@ -577,6 +560,29 @@
 #define CONFIG_OPENAL 0
 #define CONFIG_OPENCL 0
 #define CONFIG_OPENGL 1
+#define CONFIG_ALSA 0
+#define CONFIG_APPKIT 0
+#define CONFIG_AVFOUNDATION 0
+#define CONFIG_BZLIB 1
+#define CONFIG_COREIMAGE 0
+#define CONFIG_ICONV 1
+#define CONFIG_JACK 0
+#define CONFIG_LIBXCB 0
+#define CONFIG_LIBXCB_SHM 0
+#define CONFIG_LIBXCB_SHAPE 0
+#define CONFIG_LIBXCB_XFIXES 0
+#define CONFIG_LZMA 1
+#define CONFIG_SCHANNEL 0
+#define CONFIG_SDL2 1
+#define CONFIG_SECURETRANSPORT 0
+#define CONFIG_SNDIO 0
+#define CONFIG_XLIB 0
+#define CONFIG_ZLIB 1
+#define CONFIG_CUDA_SDK 0
+#define CONFIG_LIBNPP 0
+#define CONFIG_LIBMFX 1
+#define CONFIG_MMAL 0
+#define CONFIG_OMX 0
 #define CONFIG_AUDIOTOOLBOX 0
 #define CONFIG_CRYSTALHD 0
 #define CONFIG_CUDA 1
@@ -597,11 +603,6 @@
 #define CONFIG_VIDEOTOOLBOX 0
 #define CONFIG_V4L2_M2M 0
 #define CONFIG_XVMC 0
-#define CONFIG_CUDA_SDK 0
-#define CONFIG_LIBNPP 0
-#define CONFIG_LIBMFX 1
-#define CONFIG_MMAL 0
-#define CONFIG_OMX 0
 #define CONFIG_FTRAPV 0
 #define CONFIG_GRAY 0
 #define CONFIG_HARDCODED_TABLES 0
@@ -739,6 +740,7 @@
 #define CONFIG_TEXTUREDSP 1
 #define CONFIG_TEXTUREDSPENC 1
 #define CONFIG_TPELDSP 1
+#define CONFIG_VAAPI_1 0
 #define CONFIG_VAAPI_ENCODE 0
 #define CONFIG_VC1DSP 1
 #define CONFIG_VIDEODSP 1
@@ -1269,288 +1271,6 @@
 #define CONFIG_VP8_QSV_DECODER 1
 #define CONFIG_VP9_CUVID_DECODER 1
 #define CONFIG_VP9_MEDIACODEC_DECODER 0
-#define CONFIG_AA_DEMUXER 1
-#define CONFIG_AAC_DEMUXER 1
-#define CONFIG_AC3_DEMUXER 1
-#define CONFIG_ACM_DEMUXER 1
-#define CONFIG_ACT_DEMUXER 1
-#define CONFIG_ADF_DEMUXER 1
-#define CONFIG_ADP_DEMUXER 1
-#define CONFIG_ADS_DEMUXER 1
-#define CONFIG_ADX_DEMUXER 1
-#define CONFIG_AEA_DEMUXER 1
-#define CONFIG_AFC_DEMUXER 1
-#define CONFIG_AIFF_DEMUXER 1
-#define CONFIG_AIX_DEMUXER 1
-#define CONFIG_AMR_DEMUXER 1
-#define CONFIG_ANM_DEMUXER 1
-#define CONFIG_APC_DEMUXER 1
-#define CONFIG_APE_DEMUXER 1
-#define CONFIG_APNG_DEMUXER 1
-#define CONFIG_AQTITLE_DEMUXER 1
-#define CONFIG_ASF_DEMUXER 1
-#define CONFIG_ASF_O_DEMUXER 1
-#define CONFIG_ASS_DEMUXER 1
-#define CONFIG_AST_DEMUXER 1
-#define CONFIG_AU_DEMUXER 1
-#define CONFIG_AVI_DEMUXER 1
-#define CONFIG_AVISYNTH_DEMUXER 1
-#define CONFIG_AVR_DEMUXER 1
-#define CONFIG_AVS_DEMUXER 1
-#define CONFIG_BETHSOFTVID_DEMUXER 1
-#define CONFIG_BFI_DEMUXER 1
-#define CONFIG_BINTEXT_DEMUXER 1
-#define CONFIG_BINK_DEMUXER 1
-#define CONFIG_BIT_DEMUXER 1
-#define CONFIG_BMV_DEMUXER 1
-#define CONFIG_BFSTM_DEMUXER 1
-#define CONFIG_BRSTM_DEMUXER 1
-#define CONFIG_BOA_DEMUXER 1
-#define CONFIG_C93_DEMUXER 1
-#define CONFIG_CAF_DEMUXER 1
-#define CONFIG_CAVSVIDEO_DEMUXER 1
-#define CONFIG_CDG_DEMUXER 1
-#define CONFIG_CDXL_DEMUXER 1
-#define CONFIG_CINE_DEMUXER 1
-#define CONFIG_CONCAT_DEMUXER 1
-#define CONFIG_DASH_DEMUXER 1
-#define CONFIG_DATA_DEMUXER 1
-#define CONFIG_DAUD_DEMUXER 1
-#define CONFIG_DCSTR_DEMUXER 1
-#define CONFIG_DFA_DEMUXER 1
-#define CONFIG_DIRAC_DEMUXER 1
-#define CONFIG_DNXHD_DEMUXER 1
-#define CONFIG_DSF_DEMUXER 1
-#define CONFIG_DSICIN_DEMUXER 1
-#define CONFIG_DSS_DEMUXER 1
-#define CONFIG_DTS_DEMUXER 1
-#define CONFIG_DTSHD_DEMUXER 1
-#define CONFIG_DV_DEMUXER 1
-#define CONFIG_DVBSUB_DEMUXER 1
-#define CONFIG_DVBTXT_DEMUXER 1
-#define CONFIG_DXA_DEMUXER 1
-#define CONFIG_EA_DEMUXER 1
-#define CONFIG_EA_CDATA_DEMUXER 1
-#define CONFIG_EAC3_DEMUXER 1
-#define CONFIG_EPAF_DEMUXER 1
-#define CONFIG_FFM_DEMUXER 1
-#define CONFIG_FFMETADATA_DEMUXER 1
-#define CONFIG_FILMSTRIP_DEMUXER 1
-#define CONFIG_FITS_DEMUXER 1
-#define CONFIG_FLAC_DEMUXER 1
-#define CONFIG_FLIC_DEMUXER 1
-#define CONFIG_FLV_DEMUXER 1
-#define CONFIG_LIVE_FLV_DEMUXER 1
-#define CONFIG_FOURXM_DEMUXER 1
-#define CONFIG_FRM_DEMUXER 1
-#define CONFIG_FSB_DEMUXER 1
-#define CONFIG_G722_DEMUXER 1
-#define CONFIG_G723_1_DEMUXER 1
-#define CONFIG_G726_DEMUXER 1
-#define CONFIG_G726LE_DEMUXER 1
-#define CONFIG_G729_DEMUXER 1
-#define CONFIG_GDV_DEMUXER 1
-#define CONFIG_GENH_DEMUXER 1
-#define CONFIG_GIF_DEMUXER 1
-#define CONFIG_GSM_DEMUXER 1
-#define CONFIG_GXF_DEMUXER 1
-#define CONFIG_H261_DEMUXER 1
-#define CONFIG_H263_DEMUXER 1
-#define CONFIG_H264_DEMUXER 1
-#define CONFIG_HEVC_DEMUXER 1
-#define CONFIG_HLS_DEMUXER 1
-#define CONFIG_HNM_DEMUXER 1
-#define CONFIG_ICO_DEMUXER 1
-#define CONFIG_IDCIN_DEMUXER 1
-#define CONFIG_IDF_DEMUXER 1
-#define CONFIG_IFF_DEMUXER 1
-#define CONFIG_ILBC_DEMUXER 1
-#define CONFIG_IMAGE2_DEMUXER 1
-#define CONFIG_IMAGE2PIPE_DEMUXER 1
-#define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 1
-#define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 1
-#define CONFIG_INGENIENT_DEMUXER 1
-#define CONFIG_IPMOVIE_DEMUXER 1
-#define CONFIG_IRCAM_DEMUXER 1
-#define CONFIG_ISS_DEMUXER 1
-#define CONFIG_IV8_DEMUXER 1
-#define CONFIG_IVF_DEMUXER 1
-#define CONFIG_IVR_DEMUXER 1
-#define CONFIG_JACOSUB_DEMUXER 1
-#define CONFIG_JV_DEMUXER 1
-#define CONFIG_LMLM4_DEMUXER 1
-#define CONFIG_LOAS_DEMUXER 1
-#define CONFIG_LRC_DEMUXER 1
-#define CONFIG_LVF_DEMUXER 1
-#define CONFIG_LXF_DEMUXER 1
-#define CONFIG_M4V_DEMUXER 1
-#define CONFIG_MATROSKA_DEMUXER 1
-#define CONFIG_MGSTS_DEMUXER 1
-#define CONFIG_MICRODVD_DEMUXER 1
-#define CONFIG_MJPEG_DEMUXER 1
-#define CONFIG_MJPEG_2000_DEMUXER 1
-#define CONFIG_MLP_DEMUXER 1
-#define CONFIG_MLV_DEMUXER 1
-#define CONFIG_MM_DEMUXER 1
-#define CONFIG_MMF_DEMUXER 1
-#define CONFIG_MOV_DEMUXER 1
-#define CONFIG_MP3_DEMUXER 1
-#define CONFIG_MPC_DEMUXER 1
-#define CONFIG_MPC8_DEMUXER 1
-#define CONFIG_MPEGPS_DEMUXER 1
-#define CONFIG_MPEGTS_DEMUXER 1
-#define CONFIG_MPEGTSRAW_DEMUXER 1
-#define CONFIG_MPEGVIDEO_DEMUXER 1
-#define CONFIG_MPJPEG_DEMUXER 1
-#define CONFIG_MPL2_DEMUXER 1
-#define CONFIG_MPSUB_DEMUXER 1
-#define CONFIG_MSF_DEMUXER 1
-#define CONFIG_MSNWC_TCP_DEMUXER 1
-#define CONFIG_MTAF_DEMUXER 1
-#define CONFIG_MTV_DEMUXER 1
-#define CONFIG_MUSX_DEMUXER 1
-#define CONFIG_MV_DEMUXER 1
-#define CONFIG_MVI_DEMUXER 1
-#define CONFIG_MXF_DEMUXER 1
-#define CONFIG_MXG_DEMUXER 1
-#define CONFIG_NC_DEMUXER 1
-#define CONFIG_NISTSPHERE_DEMUXER 1
-#define CONFIG_NSV_DEMUXER 1
-#define CONFIG_NUT_DEMUXER 1
-#define CONFIG_NUV_DEMUXER 1
-#define CONFIG_OGG_DEMUXER 1
-#define CONFIG_OMA_DEMUXER 1
-#define CONFIG_PAF_DEMUXER 1
-#define CONFIG_PCM_ALAW_DEMUXER 1
-#define CONFIG_PCM_MULAW_DEMUXER 1
-#define CONFIG_PCM_F64BE_DEMUXER 1
-#define CONFIG_PCM_F64LE_DEMUXER 1
-#define CONFIG_PCM_F32BE_DEMUXER 1
-#define CONFIG_PCM_F32LE_DEMUXER 1
-#define CONFIG_PCM_S32BE_DEMUXER 1
-#define CONFIG_PCM_S32LE_DEMUXER 1
-#define CONFIG_PCM_S24BE_DEMUXER 1
-#define CONFIG_PCM_S24LE_DEMUXER 1
-#define CONFIG_PCM_S16BE_DEMUXER 1
-#define CONFIG_PCM_S16LE_DEMUXER 1
-#define CONFIG_PCM_S8_DEMUXER 1
-#define CONFIG_PCM_U32BE_DEMUXER 1
-#define CONFIG_PCM_U32LE_DEMUXER 1
-#define CONFIG_PCM_U24BE_DEMUXER 1
-#define CONFIG_PCM_U24LE_DEMUXER 1
-#define CONFIG_PCM_U16BE_DEMUXER 1
-#define CONFIG_PCM_U16LE_DEMUXER 1
-#define CONFIG_PCM_U8_DEMUXER 1
-#define CONFIG_PJS_DEMUXER 1
-#define CONFIG_PMP_DEMUXER 1
-#define CONFIG_PVA_DEMUXER 1
-#define CONFIG_PVF_DEMUXER 1
-#define CONFIG_QCP_DEMUXER 1
-#define CONFIG_R3D_DEMUXER 1
-#define CONFIG_RAWVIDEO_DEMUXER 1
-#define CONFIG_REALTEXT_DEMUXER 1
-#define CONFIG_REDSPARK_DEMUXER 1
-#define CONFIG_RL2_DEMUXER 1
-#define CONFIG_RM_DEMUXER 1
-#define CONFIG_ROQ_DEMUXER 1
-#define CONFIG_RPL_DEMUXER 1
-#define CONFIG_RSD_DEMUXER 1
-#define CONFIG_RSO_DEMUXER 1
-#define CONFIG_RTP_DEMUXER 1
-#define CONFIG_RTSP_DEMUXER 1
-#define CONFIG_S337M_DEMUXER 1
-#define CONFIG_SAMI_DEMUXER 1
-#define CONFIG_SAP_DEMUXER 1
-#define CONFIG_SBG_DEMUXER 1
-#define CONFIG_SCC_DEMUXER 1
-#define CONFIG_SDP_DEMUXER 1
-#define CONFIG_SDR2_DEMUXER 1
-#define CONFIG_SDS_DEMUXER 1
-#define CONFIG_SDX_DEMUXER 1
-#define CONFIG_SEGAFILM_DEMUXER 1
-#define CONFIG_SHORTEN_DEMUXER 1
-#define CONFIG_SIFF_DEMUXER 1
-#define CONFIG_SLN_DEMUXER 1
-#define CONFIG_SMACKER_DEMUXER 1
-#define CONFIG_SMJPEG_DEMUXER 1
-#define CONFIG_SMUSH_DEMUXER 1
-#define CONFIG_SOL_DEMUXER 1
-#define CONFIG_SOX_DEMUXER 1
-#define CONFIG_SPDIF_DEMUXER 1
-#define CONFIG_SRT_DEMUXER 1
-#define CONFIG_STR_DEMUXER 1
-#define CONFIG_STL_DEMUXER 1
-#define CONFIG_SUBVIEWER1_DEMUXER 1
-#define CONFIG_SUBVIEWER_DEMUXER 1
-#define CONFIG_SUP_DEMUXER 1
-#define CONFIG_SVAG_DEMUXER 1
-#define CONFIG_SWF_DEMUXER 1
-#define CONFIG_TAK_DEMUXER 1
-#define CONFIG_TEDCAPTIONS_DEMUXER 1
-#define CONFIG_THP_DEMUXER 1
-#define CONFIG_THREEDOSTR_DEMUXER 1
-#define CONFIG_TIERTEXSEQ_DEMUXER 1
-#define CONFIG_TMV_DEMUXER 1
-#define CONFIG_TRUEHD_DEMUXER 1
-#define CONFIG_TTA_DEMUXER 1
-#define CONFIG_TXD_DEMUXER 1
-#define CONFIG_TTY_DEMUXER 1
-#define CONFIG_V210_DEMUXER 1
-#define CONFIG_V210X_DEMUXER 1
-#define CONFIG_VAG_DEMUXER 1
-#define CONFIG_VC1_DEMUXER 1
-#define CONFIG_VC1T_DEMUXER 1
-#define CONFIG_VIVO_DEMUXER 1
-#define CONFIG_VMD_DEMUXER 1
-#define CONFIG_VOBSUB_DEMUXER 1
-#define CONFIG_VOC_DEMUXER 1
-#define CONFIG_VPK_DEMUXER 1
-#define CONFIG_VPLAYER_DEMUXER 1
-#define CONFIG_VQF_DEMUXER 1
-#define CONFIG_W64_DEMUXER 1
-#define CONFIG_WAV_DEMUXER 1
-#define CONFIG_WC3_DEMUXER 1
-#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
-#define CONFIG_WEBVTT_DEMUXER 1
-#define CONFIG_WSAUD_DEMUXER 1
-#define CONFIG_WSD_DEMUXER 1
-#define CONFIG_WSVQA_DEMUXER 1
-#define CONFIG_WTV_DEMUXER 1
-#define CONFIG_WVE_DEMUXER 1
-#define CONFIG_WV_DEMUXER 1
-#define CONFIG_XA_DEMUXER 1
-#define CONFIG_XBIN_DEMUXER 1
-#define CONFIG_XMV_DEMUXER 1
-#define CONFIG_XVAG_DEMUXER 1
-#define CONFIG_XWMA_DEMUXER 1
-#define CONFIG_YOP_DEMUXER 1
-#define CONFIG_YUV4MPEGPIPE_DEMUXER 1
-#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
-#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 1
-#define CONFIG_LIBGME_DEMUXER 1
-#define CONFIG_LIBMODPLUG_DEMUXER 1
-#define CONFIG_LIBOPENMPT_DEMUXER 0
 #define CONFIG_A64MULTI_ENCODER 1
 #define CONFIG_A64MULTI5_ENCODER 1
 #define CONFIG_ALIAS_PIX_ENCODER 1
@@ -1753,6 +1473,167 @@
 #define CONFIG_VP8_V4L2M2M_ENCODER 0
 #define CONFIG_VP8_VAAPI_ENCODER 0
 #define CONFIG_VP9_VAAPI_ENCODER 0
+#define CONFIG_H263_VAAPI_HWACCEL 0
+#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_H264_CUVID_HWACCEL 1
+#define CONFIG_H264_D3D11VA_HWACCEL CONFIG_D3D11VA
+#define CONFIG_H264_D3D11VA2_HWACCEL CONFIG_D3D11VA
+#define CONFIG_H264_DXVA2_HWACCEL 1
+#define CONFIG_H264_MEDIACODEC_HWACCEL 0
+#define CONFIG_H264_MMAL_HWACCEL 0
+#define CONFIG_H264_QSV_HWACCEL 1
+#define CONFIG_H264_VAAPI_HWACCEL 0
+#define CONFIG_H264_VDA_HWACCEL 0
+#define CONFIG_H264_VDA_OLD_HWACCEL 0
+#define CONFIG_H264_VDPAU_HWACCEL 0
+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_HEVC_CUVID_HWACCEL 1
+#define CONFIG_HEVC_D3D11VA_HWACCEL CONFIG_D3D11VA
+#define CONFIG_HEVC_D3D11VA2_HWACCEL CONFIG_D3D11VA
+#define CONFIG_HEVC_DXVA2_HWACCEL 1
+#define CONFIG_HEVC_MEDIACODEC_HWACCEL 0
+#define CONFIG_HEVC_QSV_HWACCEL 1
+#define CONFIG_HEVC_VAAPI_HWACCEL 0
+#define CONFIG_HEVC_VDPAU_HWACCEL 0
+#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_MJPEG_CUVID_HWACCEL 1
+#define CONFIG_MPEG1_CUVID_HWACCEL 1
+#define CONFIG_MPEG1_XVMC_HWACCEL 0
+#define CONFIG_MPEG1_VDPAU_HWACCEL 0
+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_MPEG2_CUVID_HWACCEL 1
+#define CONFIG_MPEG2_XVMC_HWACCEL 0
+#define CONFIG_MPEG2_D3D11VA_HWACCEL CONFIG_D3D11VA
+#define CONFIG_MPEG2_D3D11VA2_HWACCEL CONFIG_D3D11VA
+#define CONFIG_MPEG2_DXVA2_HWACCEL 1
+#define CONFIG_MPEG2_MMAL_HWACCEL 0
+#define CONFIG_MPEG2_QSV_HWACCEL 1
+#define CONFIG_MPEG2_VAAPI_HWACCEL 0
+#define CONFIG_MPEG2_VDPAU_HWACCEL 0
+#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_MPEG2_MEDIACODEC_HWACCEL 0
+#define CONFIG_MPEG4_CUVID_HWACCEL 1
+#define CONFIG_MPEG4_MEDIACODEC_HWACCEL 0
+#define CONFIG_MPEG4_MMAL_HWACCEL 0
+#define CONFIG_MPEG4_VAAPI_HWACCEL 0
+#define CONFIG_MPEG4_VDPAU_HWACCEL 0
+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
+#define CONFIG_VC1_CUVID_HWACCEL 1
+#define CONFIG_VC1_D3D11VA_HWACCEL CONFIG_D3D11VA
+#define CONFIG_VC1_D3D11VA2_HWACCEL CONFIG_D3D11VA
+#define CONFIG_VC1_DXVA2_HWACCEL 1
+#define CONFIG_VC1_VAAPI_HWACCEL 0
+#define CONFIG_VC1_VDPAU_HWACCEL 0
+#define CONFIG_VC1_MMAL_HWACCEL 0
+#define CONFIG_VC1_QSV_HWACCEL 1
+#define CONFIG_VP8_CUVID_HWACCEL 1
+#define CONFIG_VP8_MEDIACODEC_HWACCEL 0
+#define CONFIG_VP8_QSV_HWACCEL 1
+#define CONFIG_VP9_CUVID_HWACCEL 1
+#ifdef _WIN32
+#include <sdkddkver.h>
+#endif
+#if defined(NTDDI_WIN10_TH2)
+#   define CONFIG_VP9_D3D11VA_HWACCEL 1
+#else
+#   define CONFIG_VP9_D3D11VA_HWACCEL 0
+#endif
+#ifdef _WIN32
+#include <sdkddkver.h>
+#endif
+#if defined(NTDDI_WIN10_TH2)
+#   define CONFIG_VP9_D3D11VA2_HWACCEL 1
+#else
+#   define CONFIG_VP9_D3D11VA2_HWACCEL 0
+#endif
+#ifdef _WIN32
+#include <sdkddkver.h>
+#endif
+#if defined(NTDDI_WIN10_TH2)
+#   define CONFIG_VP9_DXVA2_HWACCEL 1
+#else
+#   define CONFIG_VP9_DXVA2_HWACCEL 0
+#endif
+#define CONFIG_VP9_MEDIACODEC_HWACCEL 0
+#define CONFIG_VP9_VAAPI_HWACCEL 0
+#define CONFIG_WMV3_D3D11VA_HWACCEL CONFIG_D3D11VA
+#define CONFIG_WMV3_D3D11VA2_HWACCEL CONFIG_D3D11VA
+#define CONFIG_WMV3_DXVA2_HWACCEL 1
+#define CONFIG_WMV3_VAAPI_HWACCEL 0
+#define CONFIG_WMV3_VDPAU_HWACCEL 0
+#define CONFIG_AAC_PARSER 1
+#define CONFIG_AAC_LATM_PARSER 1
+#define CONFIG_AC3_PARSER 1
+#define CONFIG_ADX_PARSER 1
+#define CONFIG_BMP_PARSER 1
+#define CONFIG_CAVSVIDEO_PARSER 1
+#define CONFIG_COOK_PARSER 1
+#define CONFIG_DCA_PARSER 1
+#define CONFIG_DIRAC_PARSER 1
+#define CONFIG_DNXHD_PARSER 1
+#define CONFIG_DPX_PARSER 1
+#define CONFIG_DVAUDIO_PARSER 1
+#define CONFIG_DVBSUB_PARSER 1
+#define CONFIG_DVDSUB_PARSER 1
+#define CONFIG_DVD_NAV_PARSER 1
+#define CONFIG_FLAC_PARSER 1
+#define CONFIG_G729_PARSER 1
+#define CONFIG_GSM_PARSER 1
+#define CONFIG_H261_PARSER 1
+#define CONFIG_H263_PARSER 1
+#define CONFIG_H264_PARSER 1
+#define CONFIG_HEVC_PARSER 1
+#define CONFIG_MJPEG_PARSER 1
+#define CONFIG_MLP_PARSER 1
+#define CONFIG_MPEG4VIDEO_PARSER 1
+#define CONFIG_MPEGAUDIO_PARSER 1
+#define CONFIG_MPEGVIDEO_PARSER 1
+#define CONFIG_OPUS_PARSER 1
+#define CONFIG_PNG_PARSER 1
+#define CONFIG_PNM_PARSER 1
+#define CONFIG_RV30_PARSER 1
+#define CONFIG_RV40_PARSER 1
+#define CONFIG_SIPR_PARSER 1
+#define CONFIG_TAK_PARSER 1
+#define CONFIG_VC1_PARSER 1
+#define CONFIG_VORBIS_PARSER 1
+#define CONFIG_VP3_PARSER 1
+#define CONFIG_VP8_PARSER 1
+#define CONFIG_VP9_PARSER 1
+#define CONFIG_XMA_PARSER 1
+#define CONFIG_ALSA_INDEV 0
+#define CONFIG_AVFOUNDATION_INDEV 0
+#define CONFIG_BKTR_INDEV 0
+#define CONFIG_DECKLINK_INDEV 0
+#define CONFIG_LIBNDI_NEWTEK_INDEV 0
+#define CONFIG_DSHOW_INDEV 1
+#define CONFIG_FBDEV_INDEV 0
+#define CONFIG_GDIGRAB_INDEV 1
+#define CONFIG_IEC61883_INDEV 0
+#define CONFIG_JACK_INDEV 0
+#define CONFIG_KMSGRAB_INDEV 0
+#define CONFIG_LAVFI_INDEV 1
+#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 1
+#define CONFIG_XCBGRAB_INDEV 0
+#define CONFIG_LIBCDIO_INDEV 1
+#define CONFIG_LIBDC1394_INDEV 0
+#define CONFIG_ALSA_OUTDEV 0
+#define CONFIG_CACA_OUTDEV 0
+#define CONFIG_DECKLINK_OUTDEV 0
+#define CONFIG_LIBNDI_NEWTEK_OUTDEV 0
+#define CONFIG_FBDEV_OUTDEV 0
+#define CONFIG_OPENGL_OUTDEV 1
+#define CONFIG_OSS_OUTDEV 0
+#define CONFIG_PULSE_OUTDEV 0
+#define CONFIG_SDL2_OUTDEV 1
+#define CONFIG_SNDIO_OUTDEV 0
+#define CONFIG_V4L2_OUTDEV 0
+#define CONFIG_XV_OUTDEV 0
 #define CONFIG_ABENCH_FILTER 1
 #define CONFIG_ACOMPRESSOR_FILTER 1
 #define CONFIG_ACOPY_FILTER 1
@@ -2096,115 +1977,288 @@
 #define CONFIG_SPECTRUMSYNTH_FILTER 1
 #define CONFIG_AMOVIE_FILTER 1
 #define CONFIG_MOVIE_FILTER 1
-#define CONFIG_H263_VAAPI_HWACCEL 0
-#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
-#define CONFIG_H264_CUVID_HWACCEL 1
-#define CONFIG_H264_D3D11VA_HWACCEL CONFIG_D3D11VA
-#define CONFIG_H264_D3D11VA2_HWACCEL CONFIG_D3D11VA
-#define CONFIG_H264_DXVA2_HWACCEL 1
-#define CONFIG_H264_MEDIACODEC_HWACCEL 0
-#define CONFIG_H264_MMAL_HWACCEL 0
-#define CONFIG_H264_QSV_HWACCEL 1
-#define CONFIG_H264_VAAPI_HWACCEL 0
-#define CONFIG_H264_VDA_HWACCEL 0
-#define CONFIG_H264_VDA_OLD_HWACCEL 0
-#define CONFIG_H264_VDPAU_HWACCEL 0
-#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
-#define CONFIG_HEVC_CUVID_HWACCEL 1
-#define CONFIG_HEVC_D3D11VA_HWACCEL CONFIG_D3D11VA
-#define CONFIG_HEVC_D3D11VA2_HWACCEL CONFIG_D3D11VA
-#define CONFIG_HEVC_DXVA2_HWACCEL 1
-#define CONFIG_HEVC_MEDIACODEC_HWACCEL 0
-#define CONFIG_HEVC_QSV_HWACCEL 1
-#define CONFIG_HEVC_VAAPI_HWACCEL 0
-#define CONFIG_HEVC_VDPAU_HWACCEL 0
-#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
-#define CONFIG_MJPEG_CUVID_HWACCEL 1
-#define CONFIG_MPEG1_CUVID_HWACCEL 1
-#define CONFIG_MPEG1_XVMC_HWACCEL 0
-#define CONFIG_MPEG1_VDPAU_HWACCEL 0
-#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
-#define CONFIG_MPEG2_CUVID_HWACCEL 1
-#define CONFIG_MPEG2_XVMC_HWACCEL 0
-#define CONFIG_MPEG2_D3D11VA_HWACCEL CONFIG_D3D11VA
-#define CONFIG_MPEG2_D3D11VA2_HWACCEL CONFIG_D3D11VA
-#define CONFIG_MPEG2_DXVA2_HWACCEL 1
-#define CONFIG_MPEG2_MMAL_HWACCEL 0
-#define CONFIG_MPEG2_QSV_HWACCEL 1
-#define CONFIG_MPEG2_VAAPI_HWACCEL 0
-#define CONFIG_MPEG2_VDPAU_HWACCEL 0
-#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
-#define CONFIG_MPEG2_MEDIACODEC_HWACCEL 0
-#define CONFIG_MPEG4_CUVID_HWACCEL 1
-#define CONFIG_MPEG4_MEDIACODEC_HWACCEL 0
-#define CONFIG_MPEG4_MMAL_HWACCEL 0
-#define CONFIG_MPEG4_VAAPI_HWACCEL 0
-#define CONFIG_MPEG4_VDPAU_HWACCEL 0
-#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
-#define CONFIG_VC1_CUVID_HWACCEL 1
-#define CONFIG_VC1_D3D11VA_HWACCEL CONFIG_D3D11VA
-#define CONFIG_VC1_D3D11VA2_HWACCEL CONFIG_D3D11VA
-#define CONFIG_VC1_DXVA2_HWACCEL 1
-#define CONFIG_VC1_VAAPI_HWACCEL 0
-#define CONFIG_VC1_VDPAU_HWACCEL 0
-#define CONFIG_VC1_MMAL_HWACCEL 0
-#define CONFIG_VC1_QSV_HWACCEL 1
-#define CONFIG_VP8_CUVID_HWACCEL 1
-#define CONFIG_VP8_MEDIACODEC_HWACCEL 0
-#define CONFIG_VP8_QSV_HWACCEL 1
-#define CONFIG_VP9_CUVID_HWACCEL 1
-#ifdef _WIN32
-#include <sdkddkver.h>
-#endif
-#if defined(NTDDI_WIN10_TH2)
-#   define CONFIG_VP9_D3D11VA_HWACCEL 1
-#else
-#   define CONFIG_VP9_D3D11VA_HWACCEL 0
-#endif
-#ifdef _WIN32
-#include <sdkddkver.h>
-#endif
-#if defined(NTDDI_WIN10_TH2)
-#   define CONFIG_VP9_D3D11VA2_HWACCEL 1
-#else
-#   define CONFIG_VP9_D3D11VA2_HWACCEL 0
-#endif
-#ifdef _WIN32
-#include <sdkddkver.h>
-#endif
-#if defined(NTDDI_WIN10_TH2)
-#   define CONFIG_VP9_DXVA2_HWACCEL 1
-#else
-#   define CONFIG_VP9_DXVA2_HWACCEL 0
-#endif
-#define CONFIG_VP9_MEDIACODEC_HWACCEL 0
-#define CONFIG_VP9_VAAPI_HWACCEL 0
-#define CONFIG_WMV3_D3D11VA_HWACCEL CONFIG_D3D11VA
-#define CONFIG_WMV3_D3D11VA2_HWACCEL CONFIG_D3D11VA
-#define CONFIG_WMV3_DXVA2_HWACCEL 1
-#define CONFIG_WMV3_VAAPI_HWACCEL 0
-#define CONFIG_WMV3_VDPAU_HWACCEL 0
-#define CONFIG_ALSA_INDEV 0
-#define CONFIG_AVFOUNDATION_INDEV 0
-#define CONFIG_BKTR_INDEV 0
-#define CONFIG_DECKLINK_INDEV 0
-#define CONFIG_LIBNDI_NEWTEK_INDEV 0
-#define CONFIG_DSHOW_INDEV 1
-#define CONFIG_FBDEV_INDEV 0
-#define CONFIG_GDIGRAB_INDEV 1
-#define CONFIG_IEC61883_INDEV 0
-#define CONFIG_JACK_INDEV 0
-#define CONFIG_KMSGRAB_INDEV 0
-#define CONFIG_LAVFI_INDEV 1
-#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 1
-#define CONFIG_XCBGRAB_INDEV 0
-#define CONFIG_LIBCDIO_INDEV 1
-#define CONFIG_LIBDC1394_INDEV 0
+#define CONFIG_AA_DEMUXER 1
+#define CONFIG_AAC_DEMUXER 1
+#define CONFIG_AC3_DEMUXER 1
+#define CONFIG_ACM_DEMUXER 1
+#define CONFIG_ACT_DEMUXER 1
+#define CONFIG_ADF_DEMUXER 1
+#define CONFIG_ADP_DEMUXER 1
+#define CONFIG_ADS_DEMUXER 1
+#define CONFIG_ADX_DEMUXER 1
+#define CONFIG_AEA_DEMUXER 1
+#define CONFIG_AFC_DEMUXER 1
+#define CONFIG_AIFF_DEMUXER 1
+#define CONFIG_AIX_DEMUXER 1
+#define CONFIG_AMR_DEMUXER 1
+#define CONFIG_ANM_DEMUXER 1
+#define CONFIG_APC_DEMUXER 1
+#define CONFIG_APE_DEMUXER 1
+#define CONFIG_APNG_DEMUXER 1
+#define CONFIG_AQTITLE_DEMUXER 1
+#define CONFIG_ASF_DEMUXER 1
+#define CONFIG_ASF_O_DEMUXER 1
+#define CONFIG_ASS_DEMUXER 1
+#define CONFIG_AST_DEMUXER 1
+#define CONFIG_AU_DEMUXER 1
+#define CONFIG_AVI_DEMUXER 1
+#define CONFIG_AVISYNTH_DEMUXER 1
+#define CONFIG_AVR_DEMUXER 1
+#define CONFIG_AVS_DEMUXER 1
+#define CONFIG_BETHSOFTVID_DEMUXER 1
+#define CONFIG_BFI_DEMUXER 1
+#define CONFIG_BINTEXT_DEMUXER 1
+#define CONFIG_BINK_DEMUXER 1
+#define CONFIG_BIT_DEMUXER 1
+#define CONFIG_BMV_DEMUXER 1
+#define CONFIG_BFSTM_DEMUXER 1
+#define CONFIG_BRSTM_DEMUXER 1
+#define CONFIG_BOA_DEMUXER 1
+#define CONFIG_C93_DEMUXER 1
+#define CONFIG_CAF_DEMUXER 1
+#define CONFIG_CAVSVIDEO_DEMUXER 1
+#define CONFIG_CDG_DEMUXER 1
+#define CONFIG_CDXL_DEMUXER 1
+#define CONFIG_CINE_DEMUXER 1
+#define CONFIG_CONCAT_DEMUXER 1
+#define CONFIG_DASH_DEMUXER 1
+#define CONFIG_DATA_DEMUXER 1
+#define CONFIG_DAUD_DEMUXER 1
+#define CONFIG_DCSTR_DEMUXER 1
+#define CONFIG_DFA_DEMUXER 1
+#define CONFIG_DIRAC_DEMUXER 1
+#define CONFIG_DNXHD_DEMUXER 1
+#define CONFIG_DSF_DEMUXER 1
+#define CONFIG_DSICIN_DEMUXER 1
+#define CONFIG_DSS_DEMUXER 1
+#define CONFIG_DTS_DEMUXER 1
+#define CONFIG_DTSHD_DEMUXER 1
+#define CONFIG_DV_DEMUXER 1
+#define CONFIG_DVBSUB_DEMUXER 1
+#define CONFIG_DVBTXT_DEMUXER 1
+#define CONFIG_DXA_DEMUXER 1
+#define CONFIG_EA_DEMUXER 1
+#define CONFIG_EA_CDATA_DEMUXER 1
+#define CONFIG_EAC3_DEMUXER 1
+#define CONFIG_EPAF_DEMUXER 1
+#define CONFIG_FFM_DEMUXER 1
+#define CONFIG_FFMETADATA_DEMUXER 1
+#define CONFIG_FILMSTRIP_DEMUXER 1
+#define CONFIG_FITS_DEMUXER 1
+#define CONFIG_FLAC_DEMUXER 1
+#define CONFIG_FLIC_DEMUXER 1
+#define CONFIG_FLV_DEMUXER 1
+#define CONFIG_LIVE_FLV_DEMUXER 1
+#define CONFIG_FOURXM_DEMUXER 1
+#define CONFIG_FRM_DEMUXER 1
+#define CONFIG_FSB_DEMUXER 1
+#define CONFIG_G722_DEMUXER 1
+#define CONFIG_G723_1_DEMUXER 1
+#define CONFIG_G726_DEMUXER 1
+#define CONFIG_G726LE_DEMUXER 1
+#define CONFIG_G729_DEMUXER 1
+#define CONFIG_GDV_DEMUXER 1
+#define CONFIG_GENH_DEMUXER 1
+#define CONFIG_GIF_DEMUXER 1
+#define CONFIG_GSM_DEMUXER 1
+#define CONFIG_GXF_DEMUXER 1
+#define CONFIG_H261_DEMUXER 1
+#define CONFIG_H263_DEMUXER 1
+#define CONFIG_H264_DEMUXER 1
+#define CONFIG_HEVC_DEMUXER 1
+#define CONFIG_HLS_DEMUXER 1
+#define CONFIG_HNM_DEMUXER 1
+#define CONFIG_ICO_DEMUXER 1
+#define CONFIG_IDCIN_DEMUXER 1
+#define CONFIG_IDF_DEMUXER 1
+#define CONFIG_IFF_DEMUXER 1
+#define CONFIG_ILBC_DEMUXER 1
+#define CONFIG_IMAGE2_DEMUXER 1
+#define CONFIG_IMAGE2PIPE_DEMUXER 1
+#define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 1
+#define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 1
+#define CONFIG_INGENIENT_DEMUXER 1
+#define CONFIG_IPMOVIE_DEMUXER 1
+#define CONFIG_IRCAM_DEMUXER 1
+#define CONFIG_ISS_DEMUXER 1
+#define CONFIG_IV8_DEMUXER 1
+#define CONFIG_IVF_DEMUXER 1
+#define CONFIG_IVR_DEMUXER 1
+#define CONFIG_JACOSUB_DEMUXER 1
+#define CONFIG_JV_DEMUXER 1
+#define CONFIG_LMLM4_DEMUXER 1
+#define CONFIG_LOAS_DEMUXER 1
+#define CONFIG_LRC_DEMUXER 1
+#define CONFIG_LVF_DEMUXER 1
+#define CONFIG_LXF_DEMUXER 1
+#define CONFIG_M4V_DEMUXER 1
+#define CONFIG_MATROSKA_DEMUXER 1
+#define CONFIG_MGSTS_DEMUXER 1
+#define CONFIG_MICRODVD_DEMUXER 1
+#define CONFIG_MJPEG_DEMUXER 1
+#define CONFIG_MJPEG_2000_DEMUXER 1
+#define CONFIG_MLP_DEMUXER 1
+#define CONFIG_MLV_DEMUXER 1
+#define CONFIG_MM_DEMUXER 1
+#define CONFIG_MMF_DEMUXER 1
+#define CONFIG_MOV_DEMUXER 1
+#define CONFIG_MP3_DEMUXER 1
+#define CONFIG_MPC_DEMUXER 1
+#define CONFIG_MPC8_DEMUXER 1
+#define CONFIG_MPEGPS_DEMUXER 1
+#define CONFIG_MPEGTS_DEMUXER 1
+#define CONFIG_MPEGTSRAW_DEMUXER 1
+#define CONFIG_MPEGVIDEO_DEMUXER 1
+#define CONFIG_MPJPEG_DEMUXER 1
+#define CONFIG_MPL2_DEMUXER 1
+#define CONFIG_MPSUB_DEMUXER 1
+#define CONFIG_MSF_DEMUXER 1
+#define CONFIG_MSNWC_TCP_DEMUXER 1
+#define CONFIG_MTAF_DEMUXER 1
+#define CONFIG_MTV_DEMUXER 1
+#define CONFIG_MUSX_DEMUXER 1
+#define CONFIG_MV_DEMUXER 1
+#define CONFIG_MVI_DEMUXER 1
+#define CONFIG_MXF_DEMUXER 1
+#define CONFIG_MXG_DEMUXER 1
+#define CONFIG_NC_DEMUXER 1
+#define CONFIG_NISTSPHERE_DEMUXER 1
+#define CONFIG_NSV_DEMUXER 1
+#define CONFIG_NUT_DEMUXER 1
+#define CONFIG_NUV_DEMUXER 1
+#define CONFIG_OGG_DEMUXER 1
+#define CONFIG_OMA_DEMUXER 1
+#define CONFIG_PAF_DEMUXER 1
+#define CONFIG_PCM_ALAW_DEMUXER 1
+#define CONFIG_PCM_MULAW_DEMUXER 1
+#define CONFIG_PCM_F64BE_DEMUXER 1
+#define CONFIG_PCM_F64LE_DEMUXER 1
+#define CONFIG_PCM_F32BE_DEMUXER 1
+#define CONFIG_PCM_F32LE_DEMUXER 1
+#define CONFIG_PCM_S32BE_DEMUXER 1
+#define CONFIG_PCM_S32LE_DEMUXER 1
+#define CONFIG_PCM_S24BE_DEMUXER 1
+#define CONFIG_PCM_S24LE_DEMUXER 1
+#define CONFIG_PCM_S16BE_DEMUXER 1
+#define CONFIG_PCM_S16LE_DEMUXER 1
+#define CONFIG_PCM_S8_DEMUXER 1
+#define CONFIG_PCM_U32BE_DEMUXER 1
+#define CONFIG_PCM_U32LE_DEMUXER 1
+#define CONFIG_PCM_U24BE_DEMUXER 1
+#define CONFIG_PCM_U24LE_DEMUXER 1
+#define CONFIG_PCM_U16BE_DEMUXER 1
+#define CONFIG_PCM_U16LE_DEMUXER 1
+#define CONFIG_PCM_U8_DEMUXER 1
+#define CONFIG_PJS_DEMUXER 1
+#define CONFIG_PMP_DEMUXER 1
+#define CONFIG_PVA_DEMUXER 1
+#define CONFIG_PVF_DEMUXER 1
+#define CONFIG_QCP_DEMUXER 1
+#define CONFIG_R3D_DEMUXER 1
+#define CONFIG_RAWVIDEO_DEMUXER 1
+#define CONFIG_REALTEXT_DEMUXER 1
+#define CONFIG_REDSPARK_DEMUXER 1
+#define CONFIG_RL2_DEMUXER 1
+#define CONFIG_RM_DEMUXER 1
+#define CONFIG_ROQ_DEMUXER 1
+#define CONFIG_RPL_DEMUXER 1
+#define CONFIG_RSD_DEMUXER 1
+#define CONFIG_RSO_DEMUXER 1
+#define CONFIG_RTP_DEMUXER 1
+#define CONFIG_RTSP_DEMUXER 1
+#define CONFIG_S337M_DEMUXER 1
+#define CONFIG_SAMI_DEMUXER 1
+#define CONFIG_SAP_DEMUXER 1
+#define CONFIG_SBG_DEMUXER 1
+#define CONFIG_SCC_DEMUXER 1
+#define CONFIG_SDP_DEMUXER 1
+#define CONFIG_SDR2_DEMUXER 1
+#define CONFIG_SDS_DEMUXER 1
+#define CONFIG_SDX_DEMUXER 1
+#define CONFIG_SEGAFILM_DEMUXER 1
+#define CONFIG_SHORTEN_DEMUXER 1
+#define CONFIG_SIFF_DEMUXER 1
+#define CONFIG_SLN_DEMUXER 1
+#define CONFIG_SMACKER_DEMUXER 1
+#define CONFIG_SMJPEG_DEMUXER 1
+#define CONFIG_SMUSH_DEMUXER 1
+#define CONFIG_SOL_DEMUXER 1
+#define CONFIG_SOX_DEMUXER 1
+#define CONFIG_SPDIF_DEMUXER 1
+#define CONFIG_SRT_DEMUXER 1
+#define CONFIG_STR_DEMUXER 1
+#define CONFIG_STL_DEMUXER 1
+#define CONFIG_SUBVIEWER1_DEMUXER 1
+#define CONFIG_SUBVIEWER_DEMUXER 1
+#define CONFIG_SUP_DEMUXER 1
+#define CONFIG_SVAG_DEMUXER 1
+#define CONFIG_SWF_DEMUXER 1
+#define CONFIG_TAK_DEMUXER 1
+#define CONFIG_TEDCAPTIONS_DEMUXER 1
+#define CONFIG_THP_DEMUXER 1
+#define CONFIG_THREEDOSTR_DEMUXER 1
+#define CONFIG_TIERTEXSEQ_DEMUXER 1
+#define CONFIG_TMV_DEMUXER 1
+#define CONFIG_TRUEHD_DEMUXER 1
+#define CONFIG_TTA_DEMUXER 1
+#define CONFIG_TXD_DEMUXER 1
+#define CONFIG_TTY_DEMUXER 1
+#define CONFIG_V210_DEMUXER 1
+#define CONFIG_V210X_DEMUXER 1
+#define CONFIG_VAG_DEMUXER 1
+#define CONFIG_VC1_DEMUXER 1
+#define CONFIG_VC1T_DEMUXER 1
+#define CONFIG_VIVO_DEMUXER 1
+#define CONFIG_VMD_DEMUXER 1
+#define CONFIG_VOBSUB_DEMUXER 1
+#define CONFIG_VOC_DEMUXER 1
+#define CONFIG_VPK_DEMUXER 1
+#define CONFIG_VPLAYER_DEMUXER 1
+#define CONFIG_VQF_DEMUXER 1
+#define CONFIG_W64_DEMUXER 1
+#define CONFIG_WAV_DEMUXER 1
+#define CONFIG_WC3_DEMUXER 1
+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 1
+#define CONFIG_WEBVTT_DEMUXER 1
+#define CONFIG_WSAUD_DEMUXER 1
+#define CONFIG_WSD_DEMUXER 1
+#define CONFIG_WSVQA_DEMUXER 1
+#define CONFIG_WTV_DEMUXER 1
+#define CONFIG_WVE_DEMUXER 1
+#define CONFIG_WV_DEMUXER 1
+#define CONFIG_XA_DEMUXER 1
+#define CONFIG_XBIN_DEMUXER 1
+#define CONFIG_XMV_DEMUXER 1
+#define CONFIG_XVAG_DEMUXER 1
+#define CONFIG_XWMA_DEMUXER 1
+#define CONFIG_YOP_DEMUXER 1
+#define CONFIG_YUV4MPEGPIPE_DEMUXER 1
+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 1
+#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 1
+#define CONFIG_LIBGME_DEMUXER 1
+#define CONFIG_LIBMODPLUG_DEMUXER 1
+#define CONFIG_LIBOPENMPT_DEMUXER 0
 #define CONFIG_A64_MUXER 1
 #define CONFIG_AC3_MUXER 1
 #define CONFIG_ADTS_MUXER 1
@@ -2360,58 +2414,6 @@
 #define CONFIG_WV_MUXER 1
 #define CONFIG_YUV4MPEGPIPE_MUXER 1
 #define CONFIG_CHROMAPRINT_MUXER 0
-#define CONFIG_ALSA_OUTDEV 0
-#define CONFIG_CACA_OUTDEV 0
-#define CONFIG_DECKLINK_OUTDEV 0
-#define CONFIG_LIBNDI_NEWTEK_OUTDEV 0
-#define CONFIG_FBDEV_OUTDEV 0
-#define CONFIG_OPENGL_OUTDEV 1
-#define CONFIG_OSS_OUTDEV 0
-#define CONFIG_PULSE_OUTDEV 0
-#define CONFIG_SDL2_OUTDEV 1
-#define CONFIG_SNDIO_OUTDEV 0
-#define CONFIG_V4L2_OUTDEV 0
-#define CONFIG_XV_OUTDEV 0
-#define CONFIG_AAC_PARSER 1
-#define CONFIG_AAC_LATM_PARSER 1
-#define CONFIG_AC3_PARSER 1
-#define CONFIG_ADX_PARSER 1
-#define CONFIG_BMP_PARSER 1
-#define CONFIG_CAVSVIDEO_PARSER 1
-#define CONFIG_COOK_PARSER 1
-#define CONFIG_DCA_PARSER 1
-#define CONFIG_DIRAC_PARSER 1
-#define CONFIG_DNXHD_PARSER 1
-#define CONFIG_DPX_PARSER 1
-#define CONFIG_DVAUDIO_PARSER 1
-#define CONFIG_DVBSUB_PARSER 1
-#define CONFIG_DVDSUB_PARSER 1
-#define CONFIG_DVD_NAV_PARSER 1
-#define CONFIG_FLAC_PARSER 1
-#define CONFIG_G729_PARSER 1
-#define CONFIG_GSM_PARSER 1
-#define CONFIG_H261_PARSER 1
-#define CONFIG_H263_PARSER 1
-#define CONFIG_H264_PARSER 1
-#define CONFIG_HEVC_PARSER 1
-#define CONFIG_MJPEG_PARSER 1
-#define CONFIG_MLP_PARSER 1
-#define CONFIG_MPEG4VIDEO_PARSER 1
-#define CONFIG_MPEGAUDIO_PARSER 1
-#define CONFIG_MPEGVIDEO_PARSER 1
-#define CONFIG_OPUS_PARSER 1
-#define CONFIG_PNG_PARSER 1
-#define CONFIG_PNM_PARSER 1
-#define CONFIG_RV30_PARSER 1
-#define CONFIG_RV40_PARSER 1
-#define CONFIG_SIPR_PARSER 1
-#define CONFIG_TAK_PARSER 1
-#define CONFIG_VC1_PARSER 1
-#define CONFIG_VORBIS_PARSER 1
-#define CONFIG_VP3_PARSER 1
-#define CONFIG_VP8_PARSER 1
-#define CONFIG_VP9_PARSER 1
-#define CONFIG_XMA_PARSER 1
 #define CONFIG_ASYNC_PROTOCOL 1
 #define CONFIG_BLURAY_PROTOCOL 1
 #define CONFIG_CACHE_PROTOCOL 1
diff --git a/SMP/libavutil/ffversion.h b/SMP/libavutil/ffversion.h
index 69fdbf2c0c..48d1be782f 100644
--- a/SMP/libavutil/ffversion.h
+++ b/SMP/libavutil/ffversion.h
@@ -21,5 +21,5 @@
 
 #ifndef SMP_LIBAVUTIL_FFVERSION_H
 #define SMP_LIBAVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "3.3.git"
+#define FFMPEG_VERSION "3.4.git"
 #endif /* SMP_LIBAVUTIL_FFVERSION_H */
-- 
GitLab