diff --git a/build/ffmpeg/config-x64.asm b/build/ffmpeg/config-x64.asm index 8a539b42a..13b3f69d0 100644 --- a/build/ffmpeg/config-x64.asm +++ b/build/ffmpeg/config-x64.asm @@ -31,8 +31,9 @@ %define HAVE_VFPV3 0 %define HAVE_SETEND 0 %define HAVE_ALTIVEC 0 -%define HAVE_DCBZL 1 -%define HAVE_LDBRX 1 +%define HAVE_DCBZL 0 +%define HAVE_LDBRX 0 +%define HAVE_POWER8 0 %define HAVE_PPC4XX 0 %define HAVE_VSX 0 %define HAVE_AMD3DNOW 1 @@ -54,9 +55,14 @@ %define HAVE_I686 1 %define HAVE_MIPSFPU 0 %define HAVE_MIPS32R2 0 +%define HAVE_MIPS32R5 0 +%define HAVE_MIPS64R6 0 %define HAVE_MIPSDSPR1 0 %define HAVE_MIPSDSPR2 0 -%define HAVE_LOONGSON 1 +%define HAVE_MSA 0 +%define HAVE_LOONGSON2 1 +%define HAVE_LOONGSON3 1 +%define HAVE_MMI 0 %define HAVE_ARMV5TE_EXTERNAL 0 %define HAVE_ARMV6_EXTERNAL 0 %define HAVE_ARMV6T2_EXTERNAL 0 @@ -68,6 +74,7 @@ %define HAVE_ALTIVEC_EXTERNAL 0 %define HAVE_DCBZL_EXTERNAL 0 %define HAVE_LDBRX_EXTERNAL 0 +%define HAVE_POWER8_EXTERNAL 0 %define HAVE_PPC4XX_EXTERNAL 0 %define HAVE_VSX_EXTERNAL 0 %define HAVE_AMD3DNOW_EXTERNAL 1 @@ -89,9 +96,14 @@ %define HAVE_I686_EXTERNAL 0 %define HAVE_MIPSFPU_EXTERNAL 0 %define HAVE_MIPS32R2_EXTERNAL 0 +%define HAVE_MIPS32R5_EXTERNAL 0 +%define HAVE_MIPS64R6_EXTERNAL 0 %define HAVE_MIPSDSPR1_EXTERNAL 0 %define HAVE_MIPSDSPR2_EXTERNAL 0 -%define HAVE_LOONGSON_EXTERNAL 0 +%define HAVE_MSA_EXTERNAL 0 +%define HAVE_LOONGSON2_EXTERNAL 0 +%define HAVE_LOONGSON3_EXTERNAL 0 +%define HAVE_MMI_EXTERNAL 0 %define HAVE_ARMV5TE_INLINE 0 %define HAVE_ARMV6_INLINE 0 %define HAVE_ARMV6T2_INLINE 0 @@ -103,6 +115,7 @@ %define HAVE_ALTIVEC_INLINE 0 %define HAVE_DCBZL_INLINE 0 %define HAVE_LDBRX_INLINE 0 +%define HAVE_POWER8_INLINE 0 %define HAVE_PPC4XX_INLINE 0 %define HAVE_VSX_INLINE 0 %define HAVE_AMD3DNOW_INLINE 0 @@ -124,9 +137,14 @@ %define HAVE_I686_INLINE 0 %define HAVE_MIPSFPU_INLINE 0 %define HAVE_MIPS32R2_INLINE 0 +%define HAVE_MIPS32R5_INLINE 0 +%define HAVE_MIPS64R6_INLINE 0 %define HAVE_MIPSDSPR1_INLINE 0 %define HAVE_MIPSDSPR2_INLINE 0 -%define HAVE_LOONGSON_INLINE 0 +%define HAVE_MSA_INLINE 0 +%define HAVE_LOONGSON2_INLINE 0 +%define HAVE_LOONGSON3_INLINE 0 +%define HAVE_MMI_INLINE 0 %define HAVE_ALIGNED_STACK 1 %define HAVE_FAST_64BIT 1 %define HAVE_FAST_CLZ 1 @@ -158,7 +176,6 @@ %define HAVE_ASM_TYPES_H 0 %define HAVE_CDIO_PARANOIA_H 0 %define HAVE_CDIO_PARANOIA_PARANOIA_H 0 -%define HAVE_CL_CL_H 0 %define HAVE_DEV_BKTR_IOCTL_BT848_H 0 %define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 %define HAVE_DEV_IC_BT8XX_H 0 @@ -166,6 +183,7 @@ %define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0 %define HAVE_DIRECT_H 1 %define HAVE_DLFCN_H 0 +%define HAVE_D3D11_H 1 %define HAVE_DXVA_H 1 %define HAVE_ES2_GL_H 0 %define HAVE_GSM_H 0 @@ -190,6 +208,7 @@ %define HAVE_TERMIOS_H 0 %define HAVE_UDPLITE_H 0 %define HAVE_UNISTD_H 0 +%define HAVE_VALGRIND_VALGRIND_H 0 %define HAVE_WINDOWS_H 1 %define HAVE_WINSOCK2_H 0 %define HAVE_INTRINSICS_NEON 0 @@ -197,7 +216,9 @@ %define HAVE_ATAN2F 1 %define HAVE_CBRT 1 %define HAVE_CBRTF 1 +%define HAVE_COPYSIGN 1 %define HAVE_COSF 1 +%define HAVE_ERF 1 %define HAVE_EXP2 1 %define HAVE_EXP2F 1 %define HAVE_EXPF 1 @@ -250,7 +271,6 @@ %define HAVE_LZO1X_999_COMPRESS 0 %define HAVE_MACH_ABSOLUTE_TIME 0 %define HAVE_MAPVIEWOFFILE 1 -%define HAVE_MOVEFILEEXA 1 %define HAVE_MEMALIGN 0 %define HAVE_MKSTEMP 0 %define HAVE_MMAP 0 @@ -261,6 +281,7 @@ %define HAVE_PTHREAD_CANCEL 0 %define HAVE_SCHED_GETAFFINITY 0 %define HAVE_SETCONSOLETEXTATTRIBUTE 1 +%define HAVE_SETCONSOLECTRLHANDLER 1 %define HAVE_SETMODE 1 %define HAVE_SETRLIMIT 0 %define HAVE_SLEEP 1 @@ -275,6 +296,7 @@ %define HAVE_W32THREADS 1 %define HAVE_AS_DN_DIRECTIVE 0 %define HAVE_AS_FUNC 0 +%define HAVE_AS_OBJECT_ARCH 0 %define HAVE_ASM_MOD_Q 0 %define HAVE_ATTRIBUTE_MAY_ALIAS 0 %define HAVE_ATTRIBUTE_PACKED 0 @@ -296,6 +318,7 @@ %define HAVE_CONDITION_VARIABLE_PTR 1 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 +%define HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 %define HAVE_STRUCT_IP_MREQ_SOURCE 0 %define HAVE_STRUCT_IPV6_MREQ 0 @@ -310,7 +333,7 @@ %define HAVE_ATOMICS_NATIVE 1 %define HAVE_DOS_PATHS 1 %define HAVE_DXVA2API_COBJ 1 -%define HAVE_DXVA2_LIB 1 +%define HAVE_DXVA2_LIB 0 %define HAVE_LIBC_MSVCRT 1 %define HAVE_LIBDC1394_1 0 %define HAVE_LIBDC1394_2 0 @@ -319,8 +342,10 @@ %define HAVE_PERL 1 %define HAVE_POD2MAN 0 %define HAVE_SDL 0 +%define HAVE_SECTION_DATA_REL_RO 0 %define HAVE_TEXI2HTML 0 %define HAVE_THREADS 1 +%define HAVE_VAAPI_X11 0 %define HAVE_VDPAU_X11 0 %define HAVE_XLIB 0 %define CONFIG_BSFS 1 @@ -340,6 +365,7 @@ %define CONFIG_PODPAGES 1 %define CONFIG_TXTPAGES 1 %define CONFIG_AVIO_READING_EXAMPLE 1 +%define CONFIG_AVIO_LIST_DIR_EXAMPLE 1 %define CONFIG_DECODING_ENCODING_EXAMPLE 1 %define CONFIG_DEMUXING_DECODING_EXAMPLE 1 %define CONFIG_EXTRACT_MVS_EXAMPLE 1 @@ -348,6 +374,7 @@ %define CONFIG_FILTERING_VIDEO_EXAMPLE 0 %define CONFIG_METADATA_EXAMPLE 1 %define CONFIG_MUXING_EXAMPLE 1 +%define CONFIG_QSVDEC_EXAMPLE 0 %define CONFIG_REMUXING_EXAMPLE 1 %define CONFIG_RESAMPLING_AUDIO_EXAMPLE 1 %define CONFIG_SCALING_VIDEO_EXAMPLE 1 @@ -369,6 +396,7 @@ %define CONFIG_LIBCDIO 0 %define CONFIG_LIBCELT 0 %define CONFIG_LIBDC1394 0 +%define CONFIG_LIBDCADEC 0 %define CONFIG_LIBFAAC 0 %define CONFIG_LIBFDK_AAC 0 %define CONFIG_LIBFLITE 0 @@ -379,12 +407,15 @@ %define CONFIG_LIBGSM 0 %define CONFIG_LIBIEC61883 0 %define CONFIG_LIBILBC 0 +%define CONFIG_LIBKVAZAAR 0 +%define CONFIG_LIBMFX 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_LIBOPENH264 0 %define CONFIG_LIBOPENJPEG 0 %define CONFIG_LIBOPUS 0 %define CONFIG_LIBPULSE 0 @@ -393,6 +424,7 @@ %define CONFIG_LIBSCHROEDINGER 0 %define CONFIG_LIBSHINE 0 %define CONFIG_LIBSMBCLIENT 0 +%define CONFIG_LIBSNAPPY 0 %define CONFIG_LIBSOXR 0 %define CONFIG_LIBSPEEX 0 %define CONFIG_LIBSSH 0 @@ -419,11 +451,14 @@ %define CONFIG_LIBZMQ 0 %define CONFIG_LIBZVBI 0 %define CONFIG_LZMA 0 +%define CONFIG_MMAL 0 +%define CONFIG_NVENC 0 %define CONFIG_OPENAL 0 %define CONFIG_OPENCL 0 %define CONFIG_OPENGL 0 %define CONFIG_OPENSSL 0 %define CONFIG_SDL 0 +%define CONFIG_SECURETRANSPORT 0 %define CONFIG_X11GRAB 0 %define CONFIG_XLIB 0 %define CONFIG_ZLIB 1 @@ -436,7 +471,8 @@ %define CONFIG_SMALL 0 %define CONFIG_STATIC 1 %define CONFIG_SWSCALE_ALPHA 1 -%define CONFIG_DXVA2 1 +%define CONFIG_D3D11VA 0 +%define CONFIG_DXVA2 0 %define CONFIG_VAAPI 0 %define CONFIG_VDA 0 %define CONFIG_VDPAU 0 @@ -478,6 +514,7 @@ %define CONFIG_POD2MAN 0 %define CONFIG_RAISE_MAJOR 0 %define CONFIG_THUMB 0 +%define CONFIG_VALGRIND_BACKTRACE 0 %define CONFIG_XMM_CLOBBER_TEST 0 %define CONFIG_AANDCTTABLES 1 %define CONFIG_AC3DSP 1 @@ -491,8 +528,12 @@ %define CONFIG_FAANDCT 1 %define CONFIG_FAANIDCT 1 %define CONFIG_FDCTDSP 1 +%define CONFIG_FLACDSP 1 +%define CONFIG_FMTCONVERT 1 %define CONFIG_FRAME_THREAD_ENCODER 0 +%define CONFIG_G722DSP 1 %define CONFIG_GCRYPT 0 +%define CONFIG_GMP 0 %define CONFIG_GOLOMB 1 %define CONFIG_GPLV3 0 %define CONFIG_H263DSP 1 @@ -506,7 +547,11 @@ %define CONFIG_HUFFYUVENCDSP 0 %define CONFIG_IDCTDSP 1 %define CONFIG_IIRFILTER 0 +%define CONFIG_IMDCT15 1 %define CONFIG_INTRAX8 1 +%define CONFIG_IVIDSP 0 +%define CONFIG_JPEGTABLES 1 +%define CONFIG_LIBX262 0 %define CONFIG_LGPLV3 0 %define CONFIG_LLAUDDSP 1 %define CONFIG_LLVIDDSP 1 @@ -517,28 +562,40 @@ %define CONFIG_MPEGAUDIODSP 1 %define CONFIG_MPEGVIDEO 1 %define CONFIG_MPEGVIDEOENC 1 -%define CONFIG_NETTLE 0 +%define CONFIG_MSS34DSP 1 %define CONFIG_PIXBLOCKDSP 1 %define CONFIG_QPELDSP 1 +%define CONFIG_QSV 0 +%define CONFIG_QSVDEC 0 +%define CONFIG_QSVENC 0 %define CONFIG_RANGECODER 1 %define CONFIG_RIFFDEC 1 %define CONFIG_RIFFENC 0 %define CONFIG_RTPDEC 0 %define CONFIG_RTPENC_CHAIN 0 +%define CONFIG_RV34DSP 1 %define CONFIG_SINEWIN 1 +%define CONFIG_SNAPPY 1 %define CONFIG_STARTCODE 1 +%define CONFIG_TEXTUREDSP 1 +%define CONFIG_TEXTUREDSPENC 0 %define CONFIG_TPELDSP 1 %define CONFIG_VIDEODSP 1 %define CONFIG_VP3DSP 1 +%define CONFIG_VP56DSP 1 +%define CONFIG_VP8DSP 1 %define CONFIG_WMA_FREQS 1 +%define CONFIG_WMV2DSP 1 %define CONFIG_AAC_ADTSTOASC_BSF 1 %define CONFIG_CHOMP_BSF 1 %define CONFIG_DUMP_EXTRADATA_BSF 1 %define CONFIG_H264_MP4TOANNEXB_BSF 1 +%define CONFIG_HEVC_MP4TOANNEXB_BSF 1 %define CONFIG_IMX_DUMP_HEADER_BSF 1 %define CONFIG_MJPEG2JPEG_BSF 1 %define CONFIG_MJPEGA_DUMP_HEADER_BSF 1 %define CONFIG_MP3_HEADER_DECOMPRESS_BSF 1 +%define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 1 %define CONFIG_MOV2TEXTSUB_BSF 1 %define CONFIG_NOISE_BSF 1 %define CONFIG_REMOVE_EXTRADATA_BSF 1 @@ -576,6 +633,7 @@ %define CONFIG_CPIA_DECODER 1 %define CONFIG_CSCD_DECODER 1 %define CONFIG_CYUV_DECODER 1 +%define CONFIG_DDS_DECODER 1 %define CONFIG_DFA_DECODER 1 %define CONFIG_DIRAC_DECODER 1 %define CONFIG_DNXHD_DECODER 1 @@ -613,10 +671,16 @@ %define CONFIG_H263P_DECODER 1 %define CONFIG_H264_DECODER 1 %define CONFIG_H264_CRYSTALHD_DECODER 0 +%define CONFIG_H264_MMAL_DECODER 0 +%define CONFIG_H264_QSV_DECODER 0 %define CONFIG_H264_VDA_DECODER 0 %define CONFIG_H264_VDPAU_DECODER 0 +%define CONFIG_HAP_DECODER 1 %define CONFIG_HEVC_DECODER 1 +%define CONFIG_HEVC_QSV_DECODER 0 %define CONFIG_HNM4_VIDEO_DECODER 1 +%define CONFIG_HQ_HQA_DECODER 1 +%define CONFIG_HQX_DECODER 1 %define CONFIG_HUFFYUV_DECODER 1 %define CONFIG_IDCIN_DECODER 1 %define CONFIG_IFF_BYTERUN1_DECODER 1 @@ -649,6 +713,7 @@ %define CONFIG_MPEG_VDPAU_DECODER 0 %define CONFIG_MPEG1_VDPAU_DECODER 0 %define CONFIG_MPEG2_CRYSTALHD_DECODER 0 +%define CONFIG_MPEG2_QSV_DECODER 0 %define CONFIG_MSA1_DECODER 1 %define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0 %define CONFIG_MSMPEG4V1_DECODER 1 @@ -703,6 +768,7 @@ %define CONFIG_SVQ3_DECODER 1 %define CONFIG_TARGA_DECODER 1 %define CONFIG_TARGA_Y216_DECODER 1 +%define CONFIG_TDSC_DECODER 1 %define CONFIG_THEORA_DECODER 1 %define CONFIG_THP_DECODER 1 %define CONFIG_TIERTEXSEQVIDEO_DECODER 1 @@ -726,6 +792,7 @@ %define CONFIG_VC1_CRYSTALHD_DECODER 0 %define CONFIG_VC1_VDPAU_DECODER 0 %define CONFIG_VC1IMAGE_DECODER 1 +%define CONFIG_VC1_QSV_DECODER 0 %define CONFIG_VCR1_DECODER 1 %define CONFIG_VMDVIDEO_DECODER 1 %define CONFIG_VMNC_DECODER 1 @@ -760,6 +827,7 @@ %define CONFIG_ZLIB_DECODER 1 %define CONFIG_ZMBV_DECODER 1 %define CONFIG_AAC_DECODER 1 +%define CONFIG_AAC_FIXED_DECODER 1 %define CONFIG_AAC_LATM_DECODER 1 %define CONFIG_AC3_DECODER 1 %define CONFIG_AC3_FIXED_DECODER 1 @@ -781,6 +849,7 @@ %define CONFIG_DSD_LSBF_PLANAR_DECODER 1 %define CONFIG_DSD_MSBF_PLANAR_DECODER 1 %define CONFIG_DSICINAUDIO_DECODER 1 +%define CONFIG_DSS_SP_DECODER 1 %define CONFIG_EAC3_DECODER 1 %define CONFIG_EVRC_DECODER 1 %define CONFIG_FFWAVESYNTH_DECODER 1 @@ -901,12 +970,14 @@ %define CONFIG_ADPCM_SBPRO_4_DECODER 1 %define CONFIG_ADPCM_SWF_DECODER 1 %define CONFIG_ADPCM_THP_DECODER 1 +%define CONFIG_ADPCM_THP_LE_DECODER 1 %define CONFIG_ADPCM_VIMA_DECODER 1 %define CONFIG_ADPCM_XA_DECODER 1 %define CONFIG_ADPCM_YAMAHA_DECODER 1 %define CONFIG_VIMA_DECODER 1 %define CONFIG_SSA_DECODER 1 %define CONFIG_ASS_DECODER 1 +%define CONFIG_CCAPTION_DECODER 1 %define CONFIG_DVBSUB_DECODER 1 %define CONFIG_DVDSUB_DECODER 1 %define CONFIG_JACOSUB_DECODER 1 @@ -927,6 +998,7 @@ %define CONFIG_WEBVTT_DECODER 1 %define CONFIG_XSUB_DECODER 1 %define CONFIG_LIBCELT_DECODER 0 +%define CONFIG_LIBDCADEC_DECODER 0 %define CONFIG_LIBFDK_AAC_DECODER 0 %define CONFIG_LIBGSM_DECODER 0 %define CONFIG_LIBGSM_MS_DECODER 0 @@ -962,6 +1034,7 @@ %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 @@ -975,6 +1048,7 @@ %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 @@ -991,9 +1065,11 @@ %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_DXA_DEMUXER 1 %define CONFIG_EA_DEMUXER 1 %define CONFIG_EA_CDATA_DEMUXER 1 @@ -1060,6 +1136,7 @@ %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_MSNWC_TCP_DEMUXER 1 @@ -1168,6 +1245,7 @@ %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 @@ -1175,6 +1253,7 @@ %define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1 %define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1 %define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1 +%define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 1 %define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1 %define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1 %define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1 @@ -1187,6 +1266,7 @@ %define CONFIG_A64MULTI5_ENCODER 0 %define CONFIG_ALIAS_PIX_ENCODER 0 %define CONFIG_AMV_ENCODER 0 +%define CONFIG_APNG_ENCODER 0 %define CONFIG_ASV1_ENCODER 0 %define CONFIG_ASV2_ENCODER 0 %define CONFIG_AVRP_ENCODER 0 @@ -1208,6 +1288,7 @@ %define CONFIG_H261_ENCODER 0 %define CONFIG_H263_ENCODER 0 %define CONFIG_H263P_ENCODER 0 +%define CONFIG_HAP_ENCODER 0 %define CONFIG_HUFFYUV_ENCODER 0 %define CONFIG_JPEG2000_ENCODER 0 %define CONFIG_JPEGLS_ENCODER 0 @@ -1341,13 +1422,24 @@ %define CONFIG_LIBVPX_VP8_ENCODER 0 %define CONFIG_LIBVPX_VP9_ENCODER 0 %define CONFIG_LIBWAVPACK_ENCODER 0 +%define CONFIG_LIBWEBP_ANIM_ENCODER 0 %define CONFIG_LIBWEBP_ENCODER 0 +%define CONFIG_LIBX262_ENCODER 0 %define CONFIG_LIBX264_ENCODER 0 %define CONFIG_LIBX264RGB_ENCODER 0 %define CONFIG_LIBX265_ENCODER 0 %define CONFIG_LIBXAVS_ENCODER 0 %define CONFIG_LIBXVID_ENCODER 0 %define CONFIG_LIBAACPLUS_ENCODER 0 +%define CONFIG_LIBOPENH264_ENCODER 0 +%define CONFIG_H264_QSV_ENCODER 0 +%define CONFIG_NVENC_ENCODER 0 +%define CONFIG_NVENC_H264_ENCODER 0 +%define CONFIG_NVENC_HEVC_ENCODER 0 +%define CONFIG_HEVC_QSV_ENCODER 0 +%define CONFIG_LIBKVAZAAR_ENCODER 0 +%define CONFIG_MPEG2_QSV_ENCODER 0 +%define CONFIG_ACROSSFADE_FILTER 0 %define CONFIG_ADELAY_FILTER 0 %define CONFIG_AECHO_FILTER 0 %define CONFIG_AEVAL_FILTER 0 @@ -1362,6 +1454,7 @@ %define CONFIG_APERMS_FILTER 0 %define CONFIG_APHASER_FILTER 0 %define CONFIG_ARESAMPLE_FILTER 0 +%define CONFIG_AREVERSE_FILTER 0 %define CONFIG_ASELECT_FILTER 0 %define CONFIG_ASENDCMD_FILTER 0 %define CONFIG_ASETNSAMPLES_FILTER 0 @@ -1383,7 +1476,10 @@ %define CONFIG_BS2B_FILTER 0 %define CONFIG_CHANNELMAP_FILTER 0 %define CONFIG_CHANNELSPLIT_FILTER 0 +%define CONFIG_CHORUS_FILTER 0 %define CONFIG_COMPAND_FILTER 0 +%define CONFIG_DCSHIFT_FILTER 0 +%define CONFIG_DYNAUDNORM_FILTER 0 %define CONFIG_EARWAX_FILTER 0 %define CONFIG_EBUR128_FILTER 0 %define CONFIG_EQUALIZER_FILTER 0 @@ -1395,6 +1491,7 @@ %define CONFIG_PAN_FILTER 0 %define CONFIG_REPLAYGAIN_FILTER 0 %define CONFIG_RESAMPLE_FILTER 0 +%define CONFIG_SIDECHAINCOMPRESS_FILTER 0 %define CONFIG_SILENCEDETECT_FILTER 0 %define CONFIG_SILENCEREMOVE_FILTER 0 %define CONFIG_TREBLE_FILTER 0 @@ -1416,31 +1513,44 @@ %define CONFIG_CODECVIEW_FILTER 0 %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 +%define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COPY_FILTER 0 +%define CONFIG_COVER_RECT_FILTER 0 %define CONFIG_CROP_FILTER 0 %define CONFIG_CROPDETECT_FILTER 0 %define CONFIG_CURVES_FILTER 0 %define CONFIG_DCTDNOIZ_FILTER 0 +%define CONFIG_DEBAND_FILTER 0 %define CONFIG_DECIMATE_FILTER 0 +%define CONFIG_DEFLATE_FILTER 0 %define CONFIG_DEJUDDER_FILTER 0 %define CONFIG_DELOGO_FILTER 0 %define CONFIG_DESHAKE_FILTER 0 +%define CONFIG_DETELECINE_FILTER 0 +%define CONFIG_DILATION_FILTER 0 %define CONFIG_DRAWBOX_FILTER 0 +%define CONFIG_DRAWGRAPH_FILTER 0 %define CONFIG_DRAWGRID_FILTER 0 %define CONFIG_DRAWTEXT_FILTER 0 %define CONFIG_EDGEDETECT_FILTER 0 %define CONFIG_ELBG_FILTER 0 +%define CONFIG_EQ_FILTER 0 +%define CONFIG_EROSION_FILTER 0 %define CONFIG_EXTRACTPLANES_FILTER 0 %define CONFIG_FADE_FILTER 0 +%define CONFIG_FFTFILT_FILTER 0 %define CONFIG_FIELD_FILTER 0 %define CONFIG_FIELDMATCH_FILTER 0 %define CONFIG_FIELDORDER_FILTER 0 +%define CONFIG_FIND_RECT_FILTER 0 %define CONFIG_FORMAT_FILTER 0 %define CONFIG_FPS_FILTER 0 %define CONFIG_FRAMEPACK_FILTER 0 %define CONFIG_FRAMESTEP_FILTER 0 %define CONFIG_FREI0R_FILTER 0 +%define CONFIG_FSPP_FILTER 0 %define CONFIG_GEQ_FILTER 0 %define CONFIG_GRADFUN_FILTER 0 %define CONFIG_HALDCLUT_FILTER 0 @@ -1452,6 +1562,7 @@ %define CONFIG_HUE_FILTER 0 %define CONFIG_IDET_FILTER 0 %define CONFIG_IL_FILTER 0 +%define CONFIG_INFLATE_FILTER 0 %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 @@ -1462,7 +1573,6 @@ %define CONFIG_LUTYUV_FILTER 0 %define CONFIG_MCDEINT_FILTER 0 %define CONFIG_MERGEPLANES_FILTER 0 -%define CONFIG_MP_FILTER 0 %define CONFIG_MPDECIMATE_FILTER 0 %define CONFIG_NEGATE_FILTER 0 %define CONFIG_NOFORMAT_FILTER 0 @@ -1472,14 +1582,22 @@ %define CONFIG_OVERLAY_FILTER 0 %define CONFIG_OWDENOISE_FILTER 0 %define CONFIG_PAD_FILTER 0 +%define CONFIG_PALETTEGEN_FILTER 0 +%define CONFIG_PALETTEUSE_FILTER 0 %define CONFIG_PERMS_FILTER 0 %define CONFIG_PERSPECTIVE_FILTER 0 %define CONFIG_PHASE_FILTER 0 %define CONFIG_PIXDESCTEST_FILTER 0 %define CONFIG_PP_FILTER 0 +%define CONFIG_PP7_FILTER 0 %define CONFIG_PSNR_FILTER 0 %define CONFIG_PULLUP_FILTER 0 +%define CONFIG_QP_FILTER 0 +%define CONFIG_RANDOM_FILTER 0 +%define CONFIG_REMOVEGRAIN_FILTER 0 %define CONFIG_REMOVELOGO_FILTER 0 +%define CONFIG_REPEATFIELDS_FILTER 0 +%define CONFIG_REVERSE_FILTER 0 %define CONFIG_ROTATE_FILTER 0 %define CONFIG_SAB_FILTER 0 %define CONFIG_SCALE_FILTER 0 @@ -1492,15 +1610,18 @@ %define CONFIG_SETSAR_FILTER 0 %define CONFIG_SETTB_FILTER 0 %define CONFIG_SHOWINFO_FILTER 0 +%define CONFIG_SHOWPALETTE_FILTER 0 %define CONFIG_SHUFFLEPLANES_FILTER 0 %define CONFIG_SIGNALSTATS_FILTER 0 %define CONFIG_SMARTBLUR_FILTER 0 %define CONFIG_SPLIT_FILTER 0 %define CONFIG_SPP_FILTER 0 +%define CONFIG_SSIM_FILTER 0 %define CONFIG_STEREO3D_FILTER 0 %define CONFIG_SUBTITLES_FILTER 0 %define CONFIG_SUPER2XSAI_FILTER 0 %define CONFIG_SWAPUV_FILTER 0 +%define CONFIG_TBLEND_FILTER 0 %define CONFIG_TELECINE_FILTER 0 %define CONFIG_THUMBNAIL_FILTER 0 %define CONFIG_TILE_FILTER 0 @@ -1508,6 +1629,7 @@ %define CONFIG_TRANSPOSE_FILTER 0 %define CONFIG_TRIM_FILTER 0 %define CONFIG_UNSHARP_FILTER 0 +%define CONFIG_USPP_FILTER 0 %define CONFIG_VFLIP_FILTER 0 %define CONFIG_VIDSTABDETECT_FILTER 0 %define CONFIG_VIDSTABTRANSFORM_FILTER 0 @@ -1530,31 +1652,46 @@ %define CONFIG_SMPTEHDBARS_FILTER 0 %define CONFIG_TESTSRC_FILTER 0 %define CONFIG_NULLSINK_FILTER 0 +%define CONFIG_ADRAWGRAPH_FILTER 0 %define CONFIG_AVECTORSCOPE_FILTER 0 %define CONFIG_CONCAT_FILTER 0 %define CONFIG_SHOWCQT_FILTER 0 %define CONFIG_SHOWSPECTRUM_FILTER 0 +%define CONFIG_SHOWVOLUME_FILTER 0 %define CONFIG_SHOWWAVES_FILTER 0 +%define CONFIG_SHOWWAVESPIC_FILTER 0 %define CONFIG_AMOVIE_FILTER 0 %define CONFIG_MOVIE_FILTER 0 %define CONFIG_H263_VAAPI_HWACCEL 0 %define CONFIG_H263_VDPAU_HWACCEL 0 +%define CONFIG_H264_D3D11VA_HWACCEL 0 %define CONFIG_H264_DXVA2_HWACCEL 0 +%define CONFIG_H264_MMAL_HWACCEL 0 +%define CONFIG_H264_QSV_HWACCEL 0 %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_HEVC_D3D11VA_HWACCEL 0 +%define CONFIG_HEVC_DXVA2_HWACCEL 0 +%define CONFIG_HEVC_QSV_HWACCEL 0 +%define CONFIG_HEVC_VDPAU_HWACCEL 0 %define CONFIG_MPEG1_XVMC_HWACCEL 0 %define CONFIG_MPEG1_VDPAU_HWACCEL 0 %define CONFIG_MPEG2_XVMC_HWACCEL 0 +%define CONFIG_MPEG2_D3D11VA_HWACCEL 0 %define CONFIG_MPEG2_DXVA2_HWACCEL 0 +%define CONFIG_MPEG2_QSV_HWACCEL 0 %define CONFIG_MPEG2_VAAPI_HWACCEL 0 %define CONFIG_MPEG2_VDPAU_HWACCEL 0 %define CONFIG_MPEG4_VAAPI_HWACCEL 0 %define CONFIG_MPEG4_VDPAU_HWACCEL 0 +%define CONFIG_VC1_D3D11VA_HWACCEL 0 %define CONFIG_VC1_DXVA2_HWACCEL 0 %define CONFIG_VC1_VAAPI_HWACCEL 0 %define CONFIG_VC1_VDPAU_HWACCEL 0 +%define CONFIG_VC1_QSV_HWACCEL 0 +%define CONFIG_WMV3_D3D11VA_HWACCEL 0 %define CONFIG_WMV3_DXVA2_HWACCEL 0 %define CONFIG_WMV3_VAAPI_HWACCEL 0 %define CONFIG_WMV3_VDPAU_HWACCEL 0 @@ -1586,6 +1723,7 @@ %define CONFIG_ADX_MUXER 0 %define CONFIG_AIFF_MUXER 0 %define CONFIG_AMR_MUXER 0 +%define CONFIG_APNG_MUXER 0 %define CONFIG_ASF_MUXER 0 %define CONFIG_ASS_MUXER 0 %define CONFIG_AST_MUXER 0 @@ -1657,6 +1795,7 @@ %define CONFIG_MPJPEG_MUXER 0 %define CONFIG_MXF_MUXER 0 %define CONFIG_MXF_D10_MUXER 0 +%define CONFIG_MXF_OPATOM_MUXER 0 %define CONFIG_NULL_MUXER 0 %define CONFIG_NUT_MUXER 0 %define CONFIG_OGA_MUXER 0 @@ -1689,10 +1828,12 @@ %define CONFIG_ROQ_MUXER 0 %define CONFIG_RSO_MUXER 0 %define CONFIG_RTP_MUXER 0 +%define CONFIG_RTP_MPEGTS_MUXER 0 %define CONFIG_RTSP_MUXER 0 %define CONFIG_SAP_MUXER 0 %define CONFIG_SEGMENT_MUXER 0 %define CONFIG_STREAM_SEGMENT_MUXER 0 +%define CONFIG_SINGLEJPEG_MUXER 0 %define CONFIG_SMJPEG_MUXER 0 %define CONFIG_SMOOTHSTREAMING_MUXER 0 %define CONFIG_SOX_MUXER 0 @@ -1713,6 +1854,7 @@ %define CONFIG_WAV_MUXER 0 %define CONFIG_WEBM_MUXER 0 %define CONFIG_WEBM_DASH_MANIFEST_MUXER 0 +%define CONFIG_WEBM_CHUNK_MUXER 0 %define CONFIG_WEBP_MUXER 0 %define CONFIG_WEBVTT_MUXER 0 %define CONFIG_WTV_MUXER 0 @@ -1766,6 +1908,7 @@ %define CONFIG_VP3_PARSER 1 %define CONFIG_VP8_PARSER 1 %define CONFIG_VP9_PARSER 1 +%define CONFIG_ASYNC_PROTOCOL 0 %define CONFIG_BLURAY_PROTOCOL 0 %define CONFIG_CACHE_PROTOCOL 1 %define CONFIG_CONCAT_PROTOCOL 1 @@ -1796,7 +1939,9 @@ %define CONFIG_SRTP_PROTOCOL 0 %define CONFIG_SUBFILE_PROTOCOL 1 %define CONFIG_TCP_PROTOCOL 0 -%define CONFIG_TLS_PROTOCOL 0 +%define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0 +%define CONFIG_TLS_GNUTLS_PROTOCOL 0 +%define CONFIG_TLS_OPENSSL_PROTOCOL 0 %define CONFIG_UDP_PROTOCOL 0 %define CONFIG_UDPLITE_PROTOCOL 0 %define CONFIG_UNIX_PROTOCOL 0 diff --git a/build/ffmpeg/config-x64.h b/build/ffmpeg/config-x64.h index 209ff2c8b..921478eb0 100644 --- a/build/ffmpeg/config-x64.h +++ b/build/ffmpeg/config-x64.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -#define FFMPEG_CONFIGURATION "--disable-avfilter --disable-avresample --disable-bzlib --disable-decoder='atrac3p,indeo2,indeo3,indeo4,indeo5,twinvq' --disable-devices --disable-doc --disable-encoders --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-filters --disable-hwaccels --disable-muxers --disable-network --disable-postproc --disable-pthreads --disable-shared --enable-gpl --enable-runtime-cpudetect --enable-static --enable-zlib --extra-cflags=-D_SYSCRT --extra-cflags=-I../../include --extra-cflags=-MD --extra-cflags=-wd4005 --extra-cflags=-wd4189 --extra-ldflags='-LIBPATH:../../lib/x64/Release' --toolchain=msvc" +#define FFMPEG_CONFIGURATION "--disable-avfilter --disable-avresample --disable-bzlib --disable-d3d11va --disable-dxva2 --disable-decoder='atrac3p,indeo2,indeo3,indeo4,indeo5,twinvq' --disable-devices --disable-doc --disable-encoders --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-filters --disable-hwaccels --disable-muxers --disable-network --disable-postproc --disable-pthreads --disable-shared --enable-gpl --enable-runtime-cpudetect --enable-static --enable-zlib --extra-cflags=-D_SYSCRT --extra-cflags=-I../../include --extra-cflags=-MD --extra-cflags=-wd4005 --extra-cflags=-wd4189 --extra-ldflags='-LIBPATH:../../lib/x64/Release' --toolchain=msvc" #define FFMPEG_LICENSE "GPL version 2 or later" -#define CONFIG_THIS_YEAR 2014 +#define CONFIG_THIS_YEAR 2015 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 18.00.31101 for x64" +#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 19.00.23026 for x64" #define av_restrict __restrict #define EXTERN_PREFIX "" #define EXTERN_ASM @@ -47,8 +47,9 @@ #define HAVE_VFPV3 0 #define HAVE_SETEND 0 #define HAVE_ALTIVEC 0 -#define HAVE_DCBZL 1 -#define HAVE_LDBRX 1 +#define HAVE_DCBZL 0 +#define HAVE_LDBRX 0 +#define HAVE_POWER8 0 #define HAVE_PPC4XX 0 #define HAVE_VSX 0 #define HAVE_AMD3DNOW 1 @@ -70,9 +71,14 @@ #define HAVE_I686 1 #define HAVE_MIPSFPU 0 #define HAVE_MIPS32R2 0 +#define HAVE_MIPS32R5 0 +#define HAVE_MIPS64R6 0 #define HAVE_MIPSDSPR1 0 #define HAVE_MIPSDSPR2 0 -#define HAVE_LOONGSON 1 +#define HAVE_MSA 0 +#define HAVE_LOONGSON2 1 +#define HAVE_LOONGSON3 1 +#define HAVE_MMI 0 #define HAVE_ARMV5TE_EXTERNAL 0 #define HAVE_ARMV6_EXTERNAL 0 #define HAVE_ARMV6T2_EXTERNAL 0 @@ -84,6 +90,7 @@ #define HAVE_ALTIVEC_EXTERNAL 0 #define HAVE_DCBZL_EXTERNAL 0 #define HAVE_LDBRX_EXTERNAL 0 +#define HAVE_POWER8_EXTERNAL 0 #define HAVE_PPC4XX_EXTERNAL 0 #define HAVE_VSX_EXTERNAL 0 #define HAVE_AMD3DNOW_EXTERNAL 1 @@ -105,9 +112,14 @@ #define HAVE_I686_EXTERNAL 0 #define HAVE_MIPSFPU_EXTERNAL 0 #define HAVE_MIPS32R2_EXTERNAL 0 +#define HAVE_MIPS32R5_EXTERNAL 0 +#define HAVE_MIPS64R6_EXTERNAL 0 #define HAVE_MIPSDSPR1_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 -#define HAVE_LOONGSON_EXTERNAL 0 +#define HAVE_MSA_EXTERNAL 0 +#define HAVE_LOONGSON2_EXTERNAL 0 +#define HAVE_LOONGSON3_EXTERNAL 0 +#define HAVE_MMI_EXTERNAL 0 #define HAVE_ARMV5TE_INLINE 0 #define HAVE_ARMV6_INLINE 0 #define HAVE_ARMV6T2_INLINE 0 @@ -119,6 +131,7 @@ #define HAVE_ALTIVEC_INLINE 0 #define HAVE_DCBZL_INLINE 0 #define HAVE_LDBRX_INLINE 0 +#define HAVE_POWER8_INLINE 0 #define HAVE_PPC4XX_INLINE 0 #define HAVE_VSX_INLINE 0 #define HAVE_AMD3DNOW_INLINE 0 @@ -140,9 +153,14 @@ #define HAVE_I686_INLINE 0 #define HAVE_MIPSFPU_INLINE 0 #define HAVE_MIPS32R2_INLINE 0 +#define HAVE_MIPS32R5_INLINE 0 +#define HAVE_MIPS64R6_INLINE 0 #define HAVE_MIPSDSPR1_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 -#define HAVE_LOONGSON_INLINE 0 +#define HAVE_MSA_INLINE 0 +#define HAVE_LOONGSON2_INLINE 0 +#define HAVE_LOONGSON3_INLINE 0 +#define HAVE_MMI_INLINE 0 #define HAVE_ALIGNED_STACK 1 #define HAVE_FAST_64BIT 1 #define HAVE_FAST_CLZ 1 @@ -174,7 +192,6 @@ #define HAVE_ASM_TYPES_H 0 #define HAVE_CDIO_PARANOIA_H 0 #define HAVE_CDIO_PARANOIA_PARANOIA_H 0 -#define HAVE_CL_CL_H 0 #define HAVE_DEV_BKTR_IOCTL_BT848_H 0 #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 #define HAVE_DEV_IC_BT8XX_H 0 @@ -182,6 +199,7 @@ #define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0 #define HAVE_DIRECT_H 1 #define HAVE_DLFCN_H 0 +#define HAVE_D3D11_H 1 #define HAVE_DXVA_H 1 #define HAVE_ES2_GL_H 0 #define HAVE_GSM_H 0 @@ -206,6 +224,7 @@ #define HAVE_TERMIOS_H 0 #define HAVE_UDPLITE_H 0 #define HAVE_UNISTD_H 0 +#define HAVE_VALGRIND_VALGRIND_H 0 #define HAVE_WINDOWS_H 1 #define HAVE_WINSOCK2_H 0 #define HAVE_INTRINSICS_NEON 0 @@ -213,7 +232,9 @@ #define HAVE_ATAN2F 1 #define HAVE_CBRT 1 #define HAVE_CBRTF 1 +#define HAVE_COPYSIGN 1 #define HAVE_COSF 1 +#define HAVE_ERF 1 #define HAVE_EXP2 1 #define HAVE_EXP2F 1 #define HAVE_EXPF 1 @@ -266,7 +287,6 @@ #define HAVE_LZO1X_999_COMPRESS 0 #define HAVE_MACH_ABSOLUTE_TIME 0 #define HAVE_MAPVIEWOFFILE 1 -#define HAVE_MOVEFILEEXA 1 #define HAVE_MEMALIGN 0 #define HAVE_MKSTEMP 0 #define HAVE_MMAP 0 @@ -277,6 +297,7 @@ #define HAVE_PTHREAD_CANCEL 0 #define HAVE_SCHED_GETAFFINITY 0 #define HAVE_SETCONSOLETEXTATTRIBUTE 1 +#define HAVE_SETCONSOLECTRLHANDLER 1 #define HAVE_SETMODE 1 #define HAVE_SETRLIMIT 0 #define HAVE_SLEEP 1 @@ -291,6 +312,7 @@ #define HAVE_W32THREADS 1 #define HAVE_AS_DN_DIRECTIVE 0 #define HAVE_AS_FUNC 0 +#define HAVE_AS_OBJECT_ARCH 0 #define HAVE_ASM_MOD_Q 0 #define HAVE_ATTRIBUTE_MAY_ALIAS 0 #define HAVE_ATTRIBUTE_PACKED 0 @@ -312,6 +334,7 @@ #define HAVE_CONDITION_VARIABLE_PTR 1 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 +#define HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 #define HAVE_STRUCT_IP_MREQ_SOURCE 0 #define HAVE_STRUCT_IPV6_MREQ 0 @@ -326,7 +349,7 @@ #define HAVE_ATOMICS_NATIVE 1 #define HAVE_DOS_PATHS 1 #define HAVE_DXVA2API_COBJ 1 -#define HAVE_DXVA2_LIB 1 +#define HAVE_DXVA2_LIB 0 #define HAVE_LIBC_MSVCRT 1 #define HAVE_LIBDC1394_1 0 #define HAVE_LIBDC1394_2 0 @@ -335,8 +358,10 @@ #define HAVE_PERL 1 #define HAVE_POD2MAN 0 #define HAVE_SDL 0 +#define HAVE_SECTION_DATA_REL_RO 0 #define HAVE_TEXI2HTML 0 #define HAVE_THREADS 1 +#define HAVE_VAAPI_X11 0 #define HAVE_VDPAU_X11 0 #define HAVE_XLIB 0 #define CONFIG_BSFS 1 @@ -356,6 +381,7 @@ #define CONFIG_PODPAGES 1 #define CONFIG_TXTPAGES 1 #define CONFIG_AVIO_READING_EXAMPLE 1 +#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1 #define CONFIG_DECODING_ENCODING_EXAMPLE 1 #define CONFIG_DEMUXING_DECODING_EXAMPLE 1 #define CONFIG_EXTRACT_MVS_EXAMPLE 1 @@ -364,6 +390,7 @@ #define CONFIG_FILTERING_VIDEO_EXAMPLE 0 #define CONFIG_METADATA_EXAMPLE 1 #define CONFIG_MUXING_EXAMPLE 1 +#define CONFIG_QSVDEC_EXAMPLE 0 #define CONFIG_REMUXING_EXAMPLE 1 #define CONFIG_RESAMPLING_AUDIO_EXAMPLE 1 #define CONFIG_SCALING_VIDEO_EXAMPLE 1 @@ -385,6 +412,7 @@ #define CONFIG_LIBCDIO 0 #define CONFIG_LIBCELT 0 #define CONFIG_LIBDC1394 0 +#define CONFIG_LIBDCADEC 0 #define CONFIG_LIBFAAC 0 #define CONFIG_LIBFDK_AAC 0 #define CONFIG_LIBFLITE 0 @@ -395,12 +423,15 @@ #define CONFIG_LIBGSM 0 #define CONFIG_LIBIEC61883 0 #define CONFIG_LIBILBC 0 +#define CONFIG_LIBKVAZAAR 0 +#define CONFIG_LIBMFX 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_LIBOPENH264 0 #define CONFIG_LIBOPENJPEG 0 #define CONFIG_LIBOPUS 0 #define CONFIG_LIBPULSE 0 @@ -409,6 +440,7 @@ #define CONFIG_LIBSCHROEDINGER 0 #define CONFIG_LIBSHINE 0 #define CONFIG_LIBSMBCLIENT 0 +#define CONFIG_LIBSNAPPY 0 #define CONFIG_LIBSOXR 0 #define CONFIG_LIBSPEEX 0 #define CONFIG_LIBSSH 0 @@ -435,11 +467,14 @@ #define CONFIG_LIBZMQ 0 #define CONFIG_LIBZVBI 0 #define CONFIG_LZMA 0 +#define CONFIG_MMAL 0 +#define CONFIG_NVENC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENCL 0 #define CONFIG_OPENGL 0 #define CONFIG_OPENSSL 0 #define CONFIG_SDL 0 +#define CONFIG_SECURETRANSPORT 0 #define CONFIG_X11GRAB 0 #define CONFIG_XLIB 0 #define CONFIG_ZLIB 1 @@ -452,7 +487,8 @@ #define CONFIG_SMALL 0 #define CONFIG_STATIC 1 #define CONFIG_SWSCALE_ALPHA 1 -#define CONFIG_DXVA2 1 +#define CONFIG_D3D11VA 0 +#define CONFIG_DXVA2 0 #define CONFIG_VAAPI 0 #define CONFIG_VDA 0 #define CONFIG_VDPAU 0 @@ -494,6 +530,7 @@ #define CONFIG_POD2MAN 0 #define CONFIG_RAISE_MAJOR 0 #define CONFIG_THUMB 0 +#define CONFIG_VALGRIND_BACKTRACE 0 #define CONFIG_XMM_CLOBBER_TEST 0 #define CONFIG_AANDCTTABLES 1 #define CONFIG_AC3DSP 1 @@ -507,8 +544,12 @@ #define CONFIG_FAANDCT 1 #define CONFIG_FAANIDCT 1 #define CONFIG_FDCTDSP 1 +#define CONFIG_FLACDSP 1 +#define CONFIG_FMTCONVERT 1 #define CONFIG_FRAME_THREAD_ENCODER 0 +#define CONFIG_G722DSP 1 #define CONFIG_GCRYPT 0 +#define CONFIG_GMP 0 #define CONFIG_GOLOMB 1 #define CONFIG_GPLV3 0 #define CONFIG_H263DSP 1 @@ -522,7 +563,11 @@ #define CONFIG_HUFFYUVENCDSP 0 #define CONFIG_IDCTDSP 1 #define CONFIG_IIRFILTER 0 +#define CONFIG_IMDCT15 1 #define CONFIG_INTRAX8 1 +#define CONFIG_IVIDSP 0 +#define CONFIG_JPEGTABLES 1 +#define CONFIG_LIBX262 0 #define CONFIG_LGPLV3 0 #define CONFIG_LLAUDDSP 1 #define CONFIG_LLVIDDSP 1 @@ -533,28 +578,40 @@ #define CONFIG_MPEGAUDIODSP 1 #define CONFIG_MPEGVIDEO 1 #define CONFIG_MPEGVIDEOENC 1 -#define CONFIG_NETTLE 0 +#define CONFIG_MSS34DSP 1 #define CONFIG_PIXBLOCKDSP 1 #define CONFIG_QPELDSP 1 +#define CONFIG_QSV 0 +#define CONFIG_QSVDEC 0 +#define CONFIG_QSVENC 0 #define CONFIG_RANGECODER 1 #define CONFIG_RIFFDEC 1 #define CONFIG_RIFFENC 0 #define CONFIG_RTPDEC 0 #define CONFIG_RTPENC_CHAIN 0 +#define CONFIG_RV34DSP 1 #define CONFIG_SINEWIN 1 +#define CONFIG_SNAPPY 1 #define CONFIG_STARTCODE 1 +#define CONFIG_TEXTUREDSP 1 +#define CONFIG_TEXTUREDSPENC 0 #define CONFIG_TPELDSP 1 #define CONFIG_VIDEODSP 1 #define CONFIG_VP3DSP 1 +#define CONFIG_VP56DSP 1 +#define CONFIG_VP8DSP 1 #define CONFIG_WMA_FREQS 1 +#define CONFIG_WMV2DSP 1 #define CONFIG_AAC_ADTSTOASC_BSF 1 #define CONFIG_CHOMP_BSF 1 #define CONFIG_DUMP_EXTRADATA_BSF 1 #define CONFIG_H264_MP4TOANNEXB_BSF 1 +#define CONFIG_HEVC_MP4TOANNEXB_BSF 1 #define CONFIG_IMX_DUMP_HEADER_BSF 1 #define CONFIG_MJPEG2JPEG_BSF 1 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 1 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 1 +#define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 1 #define CONFIG_MOV2TEXTSUB_BSF 1 #define CONFIG_NOISE_BSF 1 #define CONFIG_REMOVE_EXTRADATA_BSF 1 @@ -592,6 +649,7 @@ #define CONFIG_CPIA_DECODER 1 #define CONFIG_CSCD_DECODER 1 #define CONFIG_CYUV_DECODER 1 +#define CONFIG_DDS_DECODER 1 #define CONFIG_DFA_DECODER 1 #define CONFIG_DIRAC_DECODER 1 #define CONFIG_DNXHD_DECODER 1 @@ -629,10 +687,16 @@ #define CONFIG_H263P_DECODER 1 #define CONFIG_H264_DECODER 1 #define CONFIG_H264_CRYSTALHD_DECODER 0 +#define CONFIG_H264_MMAL_DECODER 0 +#define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_VDA_DECODER 0 #define CONFIG_H264_VDPAU_DECODER 0 +#define CONFIG_HAP_DECODER 1 #define CONFIG_HEVC_DECODER 1 +#define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HNM4_VIDEO_DECODER 1 +#define CONFIG_HQ_HQA_DECODER 1 +#define CONFIG_HQX_DECODER 1 #define CONFIG_HUFFYUV_DECODER 1 #define CONFIG_IDCIN_DECODER 1 #define CONFIG_IFF_BYTERUN1_DECODER 1 @@ -665,6 +729,7 @@ #define CONFIG_MPEG_VDPAU_DECODER 0 #define CONFIG_MPEG1_VDPAU_DECODER 0 #define CONFIG_MPEG2_CRYSTALHD_DECODER 0 +#define CONFIG_MPEG2_QSV_DECODER 0 #define CONFIG_MSA1_DECODER 1 #define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0 #define CONFIG_MSMPEG4V1_DECODER 1 @@ -719,6 +784,7 @@ #define CONFIG_SVQ3_DECODER 1 #define CONFIG_TARGA_DECODER 1 #define CONFIG_TARGA_Y216_DECODER 1 +#define CONFIG_TDSC_DECODER 1 #define CONFIG_THEORA_DECODER 1 #define CONFIG_THP_DECODER 1 #define CONFIG_TIERTEXSEQVIDEO_DECODER 1 @@ -742,6 +808,7 @@ #define CONFIG_VC1_CRYSTALHD_DECODER 0 #define CONFIG_VC1_VDPAU_DECODER 0 #define CONFIG_VC1IMAGE_DECODER 1 +#define CONFIG_VC1_QSV_DECODER 0 #define CONFIG_VCR1_DECODER 1 #define CONFIG_VMDVIDEO_DECODER 1 #define CONFIG_VMNC_DECODER 1 @@ -776,6 +843,7 @@ #define CONFIG_ZLIB_DECODER 1 #define CONFIG_ZMBV_DECODER 1 #define CONFIG_AAC_DECODER 1 +#define CONFIG_AAC_FIXED_DECODER 1 #define CONFIG_AAC_LATM_DECODER 1 #define CONFIG_AC3_DECODER 1 #define CONFIG_AC3_FIXED_DECODER 1 @@ -797,6 +865,7 @@ #define CONFIG_DSD_LSBF_PLANAR_DECODER 1 #define CONFIG_DSD_MSBF_PLANAR_DECODER 1 #define CONFIG_DSICINAUDIO_DECODER 1 +#define CONFIG_DSS_SP_DECODER 1 #define CONFIG_EAC3_DECODER 1 #define CONFIG_EVRC_DECODER 1 #define CONFIG_FFWAVESYNTH_DECODER 1 @@ -917,12 +986,14 @@ #define CONFIG_ADPCM_SBPRO_4_DECODER 1 #define CONFIG_ADPCM_SWF_DECODER 1 #define CONFIG_ADPCM_THP_DECODER 1 +#define CONFIG_ADPCM_THP_LE_DECODER 1 #define CONFIG_ADPCM_VIMA_DECODER 1 #define CONFIG_ADPCM_XA_DECODER 1 #define CONFIG_ADPCM_YAMAHA_DECODER 1 #define CONFIG_VIMA_DECODER 1 #define CONFIG_SSA_DECODER 1 #define CONFIG_ASS_DECODER 1 +#define CONFIG_CCAPTION_DECODER 1 #define CONFIG_DVBSUB_DECODER 1 #define CONFIG_DVDSUB_DECODER 1 #define CONFIG_JACOSUB_DECODER 1 @@ -943,6 +1014,7 @@ #define CONFIG_WEBVTT_DECODER 1 #define CONFIG_XSUB_DECODER 1 #define CONFIG_LIBCELT_DECODER 0 +#define CONFIG_LIBDCADEC_DECODER 0 #define CONFIG_LIBFDK_AAC_DECODER 0 #define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0 @@ -978,6 +1050,7 @@ #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 @@ -991,6 +1064,7 @@ #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 @@ -1007,9 +1081,11 @@ #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_DXA_DEMUXER 1 #define CONFIG_EA_DEMUXER 1 #define CONFIG_EA_CDATA_DEMUXER 1 @@ -1076,6 +1152,7 @@ #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_MSNWC_TCP_DEMUXER 1 @@ -1184,6 +1261,7 @@ #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 @@ -1191,6 +1269,7 @@ #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1 #define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1 #define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1 +#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 1 #define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1 #define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1 #define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1 @@ -1203,6 +1282,7 @@ #define CONFIG_A64MULTI5_ENCODER 0 #define CONFIG_ALIAS_PIX_ENCODER 0 #define CONFIG_AMV_ENCODER 0 +#define CONFIG_APNG_ENCODER 0 #define CONFIG_ASV1_ENCODER 0 #define CONFIG_ASV2_ENCODER 0 #define CONFIG_AVRP_ENCODER 0 @@ -1224,6 +1304,7 @@ #define CONFIG_H261_ENCODER 0 #define CONFIG_H263_ENCODER 0 #define CONFIG_H263P_ENCODER 0 +#define CONFIG_HAP_ENCODER 0 #define CONFIG_HUFFYUV_ENCODER 0 #define CONFIG_JPEG2000_ENCODER 0 #define CONFIG_JPEGLS_ENCODER 0 @@ -1357,13 +1438,24 @@ #define CONFIG_LIBVPX_VP8_ENCODER 0 #define CONFIG_LIBVPX_VP9_ENCODER 0 #define CONFIG_LIBWAVPACK_ENCODER 0 +#define CONFIG_LIBWEBP_ANIM_ENCODER 0 #define CONFIG_LIBWEBP_ENCODER 0 +#define CONFIG_LIBX262_ENCODER 0 #define CONFIG_LIBX264_ENCODER 0 #define CONFIG_LIBX264RGB_ENCODER 0 #define CONFIG_LIBX265_ENCODER 0 #define CONFIG_LIBXAVS_ENCODER 0 #define CONFIG_LIBXVID_ENCODER 0 #define CONFIG_LIBAACPLUS_ENCODER 0 +#define CONFIG_LIBOPENH264_ENCODER 0 +#define CONFIG_H264_QSV_ENCODER 0 +#define CONFIG_NVENC_ENCODER 0 +#define CONFIG_NVENC_H264_ENCODER 0 +#define CONFIG_NVENC_HEVC_ENCODER 0 +#define CONFIG_HEVC_QSV_ENCODER 0 +#define CONFIG_LIBKVAZAAR_ENCODER 0 +#define CONFIG_MPEG2_QSV_ENCODER 0 +#define CONFIG_ACROSSFADE_FILTER 0 #define CONFIG_ADELAY_FILTER 0 #define CONFIG_AECHO_FILTER 0 #define CONFIG_AEVAL_FILTER 0 @@ -1378,6 +1470,7 @@ #define CONFIG_APERMS_FILTER 0 #define CONFIG_APHASER_FILTER 0 #define CONFIG_ARESAMPLE_FILTER 0 +#define CONFIG_AREVERSE_FILTER 0 #define CONFIG_ASELECT_FILTER 0 #define CONFIG_ASENDCMD_FILTER 0 #define CONFIG_ASETNSAMPLES_FILTER 0 @@ -1399,7 +1492,10 @@ #define CONFIG_BS2B_FILTER 0 #define CONFIG_CHANNELMAP_FILTER 0 #define CONFIG_CHANNELSPLIT_FILTER 0 +#define CONFIG_CHORUS_FILTER 0 #define CONFIG_COMPAND_FILTER 0 +#define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 #define CONFIG_EBUR128_FILTER 0 #define CONFIG_EQUALIZER_FILTER 0 @@ -1411,6 +1507,7 @@ #define CONFIG_PAN_FILTER 0 #define CONFIG_REPLAYGAIN_FILTER 0 #define CONFIG_RESAMPLE_FILTER 0 +#define CONFIG_SIDECHAINCOMPRESS_FILTER 0 #define CONFIG_SILENCEDETECT_FILTER 0 #define CONFIG_SILENCEREMOVE_FILTER 0 #define CONFIG_TREBLE_FILTER 0 @@ -1432,31 +1529,44 @@ #define CONFIG_CODECVIEW_FILTER 0 #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 +#define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COPY_FILTER 0 +#define CONFIG_COVER_RECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_CROPDETECT_FILTER 0 #define CONFIG_CURVES_FILTER 0 #define CONFIG_DCTDNOIZ_FILTER 0 +#define CONFIG_DEBAND_FILTER 0 #define CONFIG_DECIMATE_FILTER 0 +#define CONFIG_DEFLATE_FILTER 0 #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 +#define CONFIG_DETELECINE_FILTER 0 +#define CONFIG_DILATION_FILTER 0 #define CONFIG_DRAWBOX_FILTER 0 +#define CONFIG_DRAWGRAPH_FILTER 0 #define CONFIG_DRAWGRID_FILTER 0 #define CONFIG_DRAWTEXT_FILTER 0 #define CONFIG_EDGEDETECT_FILTER 0 #define CONFIG_ELBG_FILTER 0 +#define CONFIG_EQ_FILTER 0 +#define CONFIG_EROSION_FILTER 0 #define CONFIG_EXTRACTPLANES_FILTER 0 #define CONFIG_FADE_FILTER 0 +#define CONFIG_FFTFILT_FILTER 0 #define CONFIG_FIELD_FILTER 0 #define CONFIG_FIELDMATCH_FILTER 0 #define CONFIG_FIELDORDER_FILTER 0 +#define CONFIG_FIND_RECT_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_FPS_FILTER 0 #define CONFIG_FRAMEPACK_FILTER 0 #define CONFIG_FRAMESTEP_FILTER 0 #define CONFIG_FREI0R_FILTER 0 +#define CONFIG_FSPP_FILTER 0 #define CONFIG_GEQ_FILTER 0 #define CONFIG_GRADFUN_FILTER 0 #define CONFIG_HALDCLUT_FILTER 0 @@ -1468,6 +1578,7 @@ #define CONFIG_HUE_FILTER 0 #define CONFIG_IDET_FILTER 0 #define CONFIG_IL_FILTER 0 +#define CONFIG_INFLATE_FILTER 0 #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 @@ -1478,7 +1589,6 @@ #define CONFIG_LUTYUV_FILTER 0 #define CONFIG_MCDEINT_FILTER 0 #define CONFIG_MERGEPLANES_FILTER 0 -#define CONFIG_MP_FILTER 0 #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 @@ -1488,14 +1598,22 @@ #define CONFIG_OVERLAY_FILTER 0 #define CONFIG_OWDENOISE_FILTER 0 #define CONFIG_PAD_FILTER 0 +#define CONFIG_PALETTEGEN_FILTER 0 +#define CONFIG_PALETTEUSE_FILTER 0 #define CONFIG_PERMS_FILTER 0 #define CONFIG_PERSPECTIVE_FILTER 0 #define CONFIG_PHASE_FILTER 0 #define CONFIG_PIXDESCTEST_FILTER 0 #define CONFIG_PP_FILTER 0 +#define CONFIG_PP7_FILTER 0 #define CONFIG_PSNR_FILTER 0 #define CONFIG_PULLUP_FILTER 0 +#define CONFIG_QP_FILTER 0 +#define CONFIG_RANDOM_FILTER 0 +#define CONFIG_REMOVEGRAIN_FILTER 0 #define CONFIG_REMOVELOGO_FILTER 0 +#define CONFIG_REPEATFIELDS_FILTER 0 +#define CONFIG_REVERSE_FILTER 0 #define CONFIG_ROTATE_FILTER 0 #define CONFIG_SAB_FILTER 0 #define CONFIG_SCALE_FILTER 0 @@ -1508,15 +1626,18 @@ #define CONFIG_SETSAR_FILTER 0 #define CONFIG_SETTB_FILTER 0 #define CONFIG_SHOWINFO_FILTER 0 +#define CONFIG_SHOWPALETTE_FILTER 0 #define CONFIG_SHUFFLEPLANES_FILTER 0 #define CONFIG_SIGNALSTATS_FILTER 0 #define CONFIG_SMARTBLUR_FILTER 0 #define CONFIG_SPLIT_FILTER 0 #define CONFIG_SPP_FILTER 0 +#define CONFIG_SSIM_FILTER 0 #define CONFIG_STEREO3D_FILTER 0 #define CONFIG_SUBTITLES_FILTER 0 #define CONFIG_SUPER2XSAI_FILTER 0 #define CONFIG_SWAPUV_FILTER 0 +#define CONFIG_TBLEND_FILTER 0 #define CONFIG_TELECINE_FILTER 0 #define CONFIG_THUMBNAIL_FILTER 0 #define CONFIG_TILE_FILTER 0 @@ -1524,6 +1645,7 @@ #define CONFIG_TRANSPOSE_FILTER 0 #define CONFIG_TRIM_FILTER 0 #define CONFIG_UNSHARP_FILTER 0 +#define CONFIG_USPP_FILTER 0 #define CONFIG_VFLIP_FILTER 0 #define CONFIG_VIDSTABDETECT_FILTER 0 #define CONFIG_VIDSTABTRANSFORM_FILTER 0 @@ -1546,31 +1668,46 @@ #define CONFIG_SMPTEHDBARS_FILTER 0 #define CONFIG_TESTSRC_FILTER 0 #define CONFIG_NULLSINK_FILTER 0 +#define CONFIG_ADRAWGRAPH_FILTER 0 #define CONFIG_AVECTORSCOPE_FILTER 0 #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 +#define CONFIG_SHOWVOLUME_FILTER 0 #define CONFIG_SHOWWAVES_FILTER 0 +#define CONFIG_SHOWWAVESPIC_FILTER 0 #define CONFIG_AMOVIE_FILTER 0 #define CONFIG_MOVIE_FILTER 0 #define CONFIG_H263_VAAPI_HWACCEL 0 #define CONFIG_H263_VDPAU_HWACCEL 0 +#define CONFIG_H264_D3D11VA_HWACCEL 0 #define CONFIG_H264_DXVA2_HWACCEL 0 +#define CONFIG_H264_MMAL_HWACCEL 0 +#define CONFIG_H264_QSV_HWACCEL 0 #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_HEVC_D3D11VA_HWACCEL 0 +#define CONFIG_HEVC_DXVA2_HWACCEL 0 +#define CONFIG_HEVC_QSV_HWACCEL 0 +#define CONFIG_HEVC_VDPAU_HWACCEL 0 #define CONFIG_MPEG1_XVMC_HWACCEL 0 #define CONFIG_MPEG1_VDPAU_HWACCEL 0 #define CONFIG_MPEG2_XVMC_HWACCEL 0 +#define CONFIG_MPEG2_D3D11VA_HWACCEL 0 #define CONFIG_MPEG2_DXVA2_HWACCEL 0 +#define CONFIG_MPEG2_QSV_HWACCEL 0 #define CONFIG_MPEG2_VAAPI_HWACCEL 0 #define CONFIG_MPEG2_VDPAU_HWACCEL 0 #define CONFIG_MPEG4_VAAPI_HWACCEL 0 #define CONFIG_MPEG4_VDPAU_HWACCEL 0 +#define CONFIG_VC1_D3D11VA_HWACCEL 0 #define CONFIG_VC1_DXVA2_HWACCEL 0 #define CONFIG_VC1_VAAPI_HWACCEL 0 #define CONFIG_VC1_VDPAU_HWACCEL 0 +#define CONFIG_VC1_QSV_HWACCEL 0 +#define CONFIG_WMV3_D3D11VA_HWACCEL 0 #define CONFIG_WMV3_DXVA2_HWACCEL 0 #define CONFIG_WMV3_VAAPI_HWACCEL 0 #define CONFIG_WMV3_VDPAU_HWACCEL 0 @@ -1602,6 +1739,7 @@ #define CONFIG_ADX_MUXER 0 #define CONFIG_AIFF_MUXER 0 #define CONFIG_AMR_MUXER 0 +#define CONFIG_APNG_MUXER 0 #define CONFIG_ASF_MUXER 0 #define CONFIG_ASS_MUXER 0 #define CONFIG_AST_MUXER 0 @@ -1673,6 +1811,7 @@ #define CONFIG_MPJPEG_MUXER 0 #define CONFIG_MXF_MUXER 0 #define CONFIG_MXF_D10_MUXER 0 +#define CONFIG_MXF_OPATOM_MUXER 0 #define CONFIG_NULL_MUXER 0 #define CONFIG_NUT_MUXER 0 #define CONFIG_OGA_MUXER 0 @@ -1705,10 +1844,12 @@ #define CONFIG_ROQ_MUXER 0 #define CONFIG_RSO_MUXER 0 #define CONFIG_RTP_MUXER 0 +#define CONFIG_RTP_MPEGTS_MUXER 0 #define CONFIG_RTSP_MUXER 0 #define CONFIG_SAP_MUXER 0 #define CONFIG_SEGMENT_MUXER 0 #define CONFIG_STREAM_SEGMENT_MUXER 0 +#define CONFIG_SINGLEJPEG_MUXER 0 #define CONFIG_SMJPEG_MUXER 0 #define CONFIG_SMOOTHSTREAMING_MUXER 0 #define CONFIG_SOX_MUXER 0 @@ -1729,6 +1870,7 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_WEBM_MUXER 0 #define CONFIG_WEBM_DASH_MANIFEST_MUXER 0 +#define CONFIG_WEBM_CHUNK_MUXER 0 #define CONFIG_WEBP_MUXER 0 #define CONFIG_WEBVTT_MUXER 0 #define CONFIG_WTV_MUXER 0 @@ -1782,6 +1924,7 @@ #define CONFIG_VP3_PARSER 1 #define CONFIG_VP8_PARSER 1 #define CONFIG_VP9_PARSER 1 +#define CONFIG_ASYNC_PROTOCOL 0 #define CONFIG_BLURAY_PROTOCOL 0 #define CONFIG_CACHE_PROTOCOL 1 #define CONFIG_CONCAT_PROTOCOL 1 @@ -1812,7 +1955,9 @@ #define CONFIG_SRTP_PROTOCOL 0 #define CONFIG_SUBFILE_PROTOCOL 1 #define CONFIG_TCP_PROTOCOL 0 -#define CONFIG_TLS_PROTOCOL 0 +#define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0 +#define CONFIG_TLS_GNUTLS_PROTOCOL 0 +#define CONFIG_TLS_OPENSSL_PROTOCOL 0 #define CONFIG_UDP_PROTOCOL 0 #define CONFIG_UDPLITE_PROTOCOL 0 #define CONFIG_UNIX_PROTOCOL 0 diff --git a/build/ffmpeg/config-x86.asm b/build/ffmpeg/config-x86.asm index e1fcf84f2..37e33ec59 100644 --- a/build/ffmpeg/config-x86.asm +++ b/build/ffmpeg/config-x86.asm @@ -31,8 +31,9 @@ %define HAVE_VFPV3 0 %define HAVE_SETEND 0 %define HAVE_ALTIVEC 0 -%define HAVE_DCBZL 1 -%define HAVE_LDBRX 1 +%define HAVE_DCBZL 0 +%define HAVE_LDBRX 0 +%define HAVE_POWER8 0 %define HAVE_PPC4XX 0 %define HAVE_VSX 0 %define HAVE_AMD3DNOW 1 @@ -54,9 +55,14 @@ %define HAVE_I686 1 %define HAVE_MIPSFPU 0 %define HAVE_MIPS32R2 0 +%define HAVE_MIPS32R5 0 +%define HAVE_MIPS64R6 0 %define HAVE_MIPSDSPR1 0 %define HAVE_MIPSDSPR2 0 -%define HAVE_LOONGSON 1 +%define HAVE_MSA 0 +%define HAVE_LOONGSON2 1 +%define HAVE_LOONGSON3 1 +%define HAVE_MMI 0 %define HAVE_ARMV5TE_EXTERNAL 0 %define HAVE_ARMV6_EXTERNAL 0 %define HAVE_ARMV6T2_EXTERNAL 0 @@ -68,6 +74,7 @@ %define HAVE_ALTIVEC_EXTERNAL 0 %define HAVE_DCBZL_EXTERNAL 0 %define HAVE_LDBRX_EXTERNAL 0 +%define HAVE_POWER8_EXTERNAL 0 %define HAVE_PPC4XX_EXTERNAL 0 %define HAVE_VSX_EXTERNAL 0 %define HAVE_AMD3DNOW_EXTERNAL 1 @@ -89,9 +96,14 @@ %define HAVE_I686_EXTERNAL 0 %define HAVE_MIPSFPU_EXTERNAL 0 %define HAVE_MIPS32R2_EXTERNAL 0 +%define HAVE_MIPS32R5_EXTERNAL 0 +%define HAVE_MIPS64R6_EXTERNAL 0 %define HAVE_MIPSDSPR1_EXTERNAL 0 %define HAVE_MIPSDSPR2_EXTERNAL 0 -%define HAVE_LOONGSON_EXTERNAL 0 +%define HAVE_MSA_EXTERNAL 0 +%define HAVE_LOONGSON2_EXTERNAL 0 +%define HAVE_LOONGSON3_EXTERNAL 0 +%define HAVE_MMI_EXTERNAL 0 %define HAVE_ARMV5TE_INLINE 0 %define HAVE_ARMV6_INLINE 0 %define HAVE_ARMV6T2_INLINE 0 @@ -103,6 +115,7 @@ %define HAVE_ALTIVEC_INLINE 0 %define HAVE_DCBZL_INLINE 0 %define HAVE_LDBRX_INLINE 0 +%define HAVE_POWER8_INLINE 0 %define HAVE_PPC4XX_INLINE 0 %define HAVE_VSX_INLINE 0 %define HAVE_AMD3DNOW_INLINE 0 @@ -124,9 +137,14 @@ %define HAVE_I686_INLINE 0 %define HAVE_MIPSFPU_INLINE 0 %define HAVE_MIPS32R2_INLINE 0 +%define HAVE_MIPS32R5_INLINE 0 +%define HAVE_MIPS64R6_INLINE 0 %define HAVE_MIPSDSPR1_INLINE 0 %define HAVE_MIPSDSPR2_INLINE 0 -%define HAVE_LOONGSON_INLINE 0 +%define HAVE_MSA_INLINE 0 +%define HAVE_LOONGSON2_INLINE 0 +%define HAVE_LOONGSON3_INLINE 0 +%define HAVE_MMI_INLINE 0 %define HAVE_ALIGNED_STACK 0 %define HAVE_FAST_64BIT 0 %define HAVE_FAST_CLZ 1 @@ -158,7 +176,6 @@ %define HAVE_ASM_TYPES_H 0 %define HAVE_CDIO_PARANOIA_H 0 %define HAVE_CDIO_PARANOIA_PARANOIA_H 0 -%define HAVE_CL_CL_H 0 %define HAVE_DEV_BKTR_IOCTL_BT848_H 0 %define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 %define HAVE_DEV_IC_BT8XX_H 0 @@ -166,6 +183,7 @@ %define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0 %define HAVE_DIRECT_H 1 %define HAVE_DLFCN_H 0 +%define HAVE_D3D11_H 1 %define HAVE_DXVA_H 1 %define HAVE_ES2_GL_H 0 %define HAVE_GSM_H 0 @@ -190,6 +208,7 @@ %define HAVE_TERMIOS_H 0 %define HAVE_UDPLITE_H 0 %define HAVE_UNISTD_H 0 +%define HAVE_VALGRIND_VALGRIND_H 0 %define HAVE_WINDOWS_H 1 %define HAVE_WINSOCK2_H 0 %define HAVE_INTRINSICS_NEON 0 @@ -197,7 +216,9 @@ %define HAVE_ATAN2F 1 %define HAVE_CBRT 1 %define HAVE_CBRTF 1 +%define HAVE_COPYSIGN 1 %define HAVE_COSF 1 +%define HAVE_ERF 1 %define HAVE_EXP2 1 %define HAVE_EXP2F 1 %define HAVE_EXPF 1 @@ -250,7 +271,6 @@ %define HAVE_LZO1X_999_COMPRESS 0 %define HAVE_MACH_ABSOLUTE_TIME 0 %define HAVE_MAPVIEWOFFILE 1 -%define HAVE_MOVEFILEEXA 1 %define HAVE_MEMALIGN 0 %define HAVE_MKSTEMP 0 %define HAVE_MMAP 0 @@ -261,6 +281,7 @@ %define HAVE_PTHREAD_CANCEL 0 %define HAVE_SCHED_GETAFFINITY 0 %define HAVE_SETCONSOLETEXTATTRIBUTE 1 +%define HAVE_SETCONSOLECTRLHANDLER 1 %define HAVE_SETMODE 1 %define HAVE_SETRLIMIT 0 %define HAVE_SLEEP 1 @@ -275,6 +296,7 @@ %define HAVE_W32THREADS 1 %define HAVE_AS_DN_DIRECTIVE 0 %define HAVE_AS_FUNC 0 +%define HAVE_AS_OBJECT_ARCH 0 %define HAVE_ASM_MOD_Q 0 %define HAVE_ATTRIBUTE_MAY_ALIAS 0 %define HAVE_ATTRIBUTE_PACKED 0 @@ -296,6 +318,7 @@ %define HAVE_CONDITION_VARIABLE_PTR 1 %define HAVE_SOCKLEN_T 0 %define HAVE_STRUCT_ADDRINFO 0 +%define HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING 0 %define HAVE_STRUCT_GROUP_SOURCE_REQ 0 %define HAVE_STRUCT_IP_MREQ_SOURCE 0 %define HAVE_STRUCT_IPV6_MREQ 0 @@ -310,7 +333,7 @@ %define HAVE_ATOMICS_NATIVE 1 %define HAVE_DOS_PATHS 1 %define HAVE_DXVA2API_COBJ 1 -%define HAVE_DXVA2_LIB 1 +%define HAVE_DXVA2_LIB 0 %define HAVE_LIBC_MSVCRT 1 %define HAVE_LIBDC1394_1 0 %define HAVE_LIBDC1394_2 0 @@ -319,8 +342,10 @@ %define HAVE_PERL 1 %define HAVE_POD2MAN 0 %define HAVE_SDL 0 +%define HAVE_SECTION_DATA_REL_RO 0 %define HAVE_TEXI2HTML 0 %define HAVE_THREADS 1 +%define HAVE_VAAPI_X11 0 %define HAVE_VDPAU_X11 0 %define HAVE_XLIB 0 %define CONFIG_BSFS 1 @@ -340,6 +365,7 @@ %define CONFIG_PODPAGES 1 %define CONFIG_TXTPAGES 1 %define CONFIG_AVIO_READING_EXAMPLE 1 +%define CONFIG_AVIO_LIST_DIR_EXAMPLE 1 %define CONFIG_DECODING_ENCODING_EXAMPLE 1 %define CONFIG_DEMUXING_DECODING_EXAMPLE 1 %define CONFIG_EXTRACT_MVS_EXAMPLE 1 @@ -348,6 +374,7 @@ %define CONFIG_FILTERING_VIDEO_EXAMPLE 0 %define CONFIG_METADATA_EXAMPLE 1 %define CONFIG_MUXING_EXAMPLE 1 +%define CONFIG_QSVDEC_EXAMPLE 0 %define CONFIG_REMUXING_EXAMPLE 1 %define CONFIG_RESAMPLING_AUDIO_EXAMPLE 1 %define CONFIG_SCALING_VIDEO_EXAMPLE 1 @@ -369,6 +396,7 @@ %define CONFIG_LIBCDIO 0 %define CONFIG_LIBCELT 0 %define CONFIG_LIBDC1394 0 +%define CONFIG_LIBDCADEC 0 %define CONFIG_LIBFAAC 0 %define CONFIG_LIBFDK_AAC 0 %define CONFIG_LIBFLITE 0 @@ -379,12 +407,15 @@ %define CONFIG_LIBGSM 0 %define CONFIG_LIBIEC61883 0 %define CONFIG_LIBILBC 0 +%define CONFIG_LIBKVAZAAR 0 +%define CONFIG_LIBMFX 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_LIBOPENH264 0 %define CONFIG_LIBOPENJPEG 0 %define CONFIG_LIBOPUS 0 %define CONFIG_LIBPULSE 0 @@ -393,6 +424,7 @@ %define CONFIG_LIBSCHROEDINGER 0 %define CONFIG_LIBSHINE 0 %define CONFIG_LIBSMBCLIENT 0 +%define CONFIG_LIBSNAPPY 0 %define CONFIG_LIBSOXR 0 %define CONFIG_LIBSPEEX 0 %define CONFIG_LIBSSH 0 @@ -419,11 +451,14 @@ %define CONFIG_LIBZMQ 0 %define CONFIG_LIBZVBI 0 %define CONFIG_LZMA 0 +%define CONFIG_MMAL 0 +%define CONFIG_NVENC 0 %define CONFIG_OPENAL 0 %define CONFIG_OPENCL 0 %define CONFIG_OPENGL 0 %define CONFIG_OPENSSL 0 %define CONFIG_SDL 0 +%define CONFIG_SECURETRANSPORT 0 %define CONFIG_X11GRAB 0 %define CONFIG_XLIB 0 %define CONFIG_ZLIB 1 @@ -436,7 +471,8 @@ %define CONFIG_SMALL 0 %define CONFIG_STATIC 1 %define CONFIG_SWSCALE_ALPHA 1 -%define CONFIG_DXVA2 1 +%define CONFIG_D3D11VA 0 +%define CONFIG_DXVA2 0 %define CONFIG_VAAPI 0 %define CONFIG_VDA 0 %define CONFIG_VDPAU 0 @@ -478,6 +514,7 @@ %define CONFIG_POD2MAN 0 %define CONFIG_RAISE_MAJOR 0 %define CONFIG_THUMB 0 +%define CONFIG_VALGRIND_BACKTRACE 0 %define CONFIG_XMM_CLOBBER_TEST 0 %define CONFIG_AANDCTTABLES 1 %define CONFIG_AC3DSP 1 @@ -491,8 +528,12 @@ %define CONFIG_FAANDCT 1 %define CONFIG_FAANIDCT 1 %define CONFIG_FDCTDSP 1 +%define CONFIG_FLACDSP 1 +%define CONFIG_FMTCONVERT 1 %define CONFIG_FRAME_THREAD_ENCODER 0 +%define CONFIG_G722DSP 1 %define CONFIG_GCRYPT 0 +%define CONFIG_GMP 0 %define CONFIG_GOLOMB 1 %define CONFIG_GPLV3 0 %define CONFIG_H263DSP 1 @@ -506,7 +547,11 @@ %define CONFIG_HUFFYUVENCDSP 0 %define CONFIG_IDCTDSP 1 %define CONFIG_IIRFILTER 0 +%define CONFIG_IMDCT15 1 %define CONFIG_INTRAX8 1 +%define CONFIG_IVIDSP 0 +%define CONFIG_JPEGTABLES 1 +%define CONFIG_LIBX262 0 %define CONFIG_LGPLV3 0 %define CONFIG_LLAUDDSP 1 %define CONFIG_LLVIDDSP 1 @@ -517,28 +562,40 @@ %define CONFIG_MPEGAUDIODSP 1 %define CONFIG_MPEGVIDEO 1 %define CONFIG_MPEGVIDEOENC 1 -%define CONFIG_NETTLE 0 +%define CONFIG_MSS34DSP 1 %define CONFIG_PIXBLOCKDSP 1 %define CONFIG_QPELDSP 1 +%define CONFIG_QSV 0 +%define CONFIG_QSVDEC 0 +%define CONFIG_QSVENC 0 %define CONFIG_RANGECODER 1 %define CONFIG_RIFFDEC 1 %define CONFIG_RIFFENC 0 %define CONFIG_RTPDEC 0 %define CONFIG_RTPENC_CHAIN 0 +%define CONFIG_RV34DSP 1 %define CONFIG_SINEWIN 1 +%define CONFIG_SNAPPY 1 %define CONFIG_STARTCODE 1 +%define CONFIG_TEXTUREDSP 1 +%define CONFIG_TEXTUREDSPENC 0 %define CONFIG_TPELDSP 1 %define CONFIG_VIDEODSP 1 %define CONFIG_VP3DSP 1 +%define CONFIG_VP56DSP 1 +%define CONFIG_VP8DSP 1 %define CONFIG_WMA_FREQS 1 +%define CONFIG_WMV2DSP 1 %define CONFIG_AAC_ADTSTOASC_BSF 1 %define CONFIG_CHOMP_BSF 1 %define CONFIG_DUMP_EXTRADATA_BSF 1 %define CONFIG_H264_MP4TOANNEXB_BSF 1 +%define CONFIG_HEVC_MP4TOANNEXB_BSF 1 %define CONFIG_IMX_DUMP_HEADER_BSF 1 %define CONFIG_MJPEG2JPEG_BSF 1 %define CONFIG_MJPEGA_DUMP_HEADER_BSF 1 %define CONFIG_MP3_HEADER_DECOMPRESS_BSF 1 +%define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 1 %define CONFIG_MOV2TEXTSUB_BSF 1 %define CONFIG_NOISE_BSF 1 %define CONFIG_REMOVE_EXTRADATA_BSF 1 @@ -576,6 +633,7 @@ %define CONFIG_CPIA_DECODER 1 %define CONFIG_CSCD_DECODER 1 %define CONFIG_CYUV_DECODER 1 +%define CONFIG_DDS_DECODER 1 %define CONFIG_DFA_DECODER 1 %define CONFIG_DIRAC_DECODER 1 %define CONFIG_DNXHD_DECODER 1 @@ -613,10 +671,16 @@ %define CONFIG_H263P_DECODER 1 %define CONFIG_H264_DECODER 1 %define CONFIG_H264_CRYSTALHD_DECODER 0 +%define CONFIG_H264_MMAL_DECODER 0 +%define CONFIG_H264_QSV_DECODER 0 %define CONFIG_H264_VDA_DECODER 0 %define CONFIG_H264_VDPAU_DECODER 0 +%define CONFIG_HAP_DECODER 1 %define CONFIG_HEVC_DECODER 1 +%define CONFIG_HEVC_QSV_DECODER 0 %define CONFIG_HNM4_VIDEO_DECODER 1 +%define CONFIG_HQ_HQA_DECODER 1 +%define CONFIG_HQX_DECODER 1 %define CONFIG_HUFFYUV_DECODER 1 %define CONFIG_IDCIN_DECODER 1 %define CONFIG_IFF_BYTERUN1_DECODER 1 @@ -649,6 +713,7 @@ %define CONFIG_MPEG_VDPAU_DECODER 0 %define CONFIG_MPEG1_VDPAU_DECODER 0 %define CONFIG_MPEG2_CRYSTALHD_DECODER 0 +%define CONFIG_MPEG2_QSV_DECODER 0 %define CONFIG_MSA1_DECODER 1 %define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0 %define CONFIG_MSMPEG4V1_DECODER 1 @@ -703,6 +768,7 @@ %define CONFIG_SVQ3_DECODER 1 %define CONFIG_TARGA_DECODER 1 %define CONFIG_TARGA_Y216_DECODER 1 +%define CONFIG_TDSC_DECODER 1 %define CONFIG_THEORA_DECODER 1 %define CONFIG_THP_DECODER 1 %define CONFIG_TIERTEXSEQVIDEO_DECODER 1 @@ -726,6 +792,7 @@ %define CONFIG_VC1_CRYSTALHD_DECODER 0 %define CONFIG_VC1_VDPAU_DECODER 0 %define CONFIG_VC1IMAGE_DECODER 1 +%define CONFIG_VC1_QSV_DECODER 0 %define CONFIG_VCR1_DECODER 1 %define CONFIG_VMDVIDEO_DECODER 1 %define CONFIG_VMNC_DECODER 1 @@ -760,6 +827,7 @@ %define CONFIG_ZLIB_DECODER 1 %define CONFIG_ZMBV_DECODER 1 %define CONFIG_AAC_DECODER 1 +%define CONFIG_AAC_FIXED_DECODER 1 %define CONFIG_AAC_LATM_DECODER 1 %define CONFIG_AC3_DECODER 1 %define CONFIG_AC3_FIXED_DECODER 1 @@ -781,6 +849,7 @@ %define CONFIG_DSD_LSBF_PLANAR_DECODER 1 %define CONFIG_DSD_MSBF_PLANAR_DECODER 1 %define CONFIG_DSICINAUDIO_DECODER 1 +%define CONFIG_DSS_SP_DECODER 1 %define CONFIG_EAC3_DECODER 1 %define CONFIG_EVRC_DECODER 1 %define CONFIG_FFWAVESYNTH_DECODER 1 @@ -901,12 +970,14 @@ %define CONFIG_ADPCM_SBPRO_4_DECODER 1 %define CONFIG_ADPCM_SWF_DECODER 1 %define CONFIG_ADPCM_THP_DECODER 1 +%define CONFIG_ADPCM_THP_LE_DECODER 1 %define CONFIG_ADPCM_VIMA_DECODER 1 %define CONFIG_ADPCM_XA_DECODER 1 %define CONFIG_ADPCM_YAMAHA_DECODER 1 %define CONFIG_VIMA_DECODER 1 %define CONFIG_SSA_DECODER 1 %define CONFIG_ASS_DECODER 1 +%define CONFIG_CCAPTION_DECODER 1 %define CONFIG_DVBSUB_DECODER 1 %define CONFIG_DVDSUB_DECODER 1 %define CONFIG_JACOSUB_DECODER 1 @@ -927,6 +998,7 @@ %define CONFIG_WEBVTT_DECODER 1 %define CONFIG_XSUB_DECODER 1 %define CONFIG_LIBCELT_DECODER 0 +%define CONFIG_LIBDCADEC_DECODER 0 %define CONFIG_LIBFDK_AAC_DECODER 0 %define CONFIG_LIBGSM_DECODER 0 %define CONFIG_LIBGSM_MS_DECODER 0 @@ -962,6 +1034,7 @@ %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 @@ -975,6 +1048,7 @@ %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 @@ -991,9 +1065,11 @@ %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_DXA_DEMUXER 1 %define CONFIG_EA_DEMUXER 1 %define CONFIG_EA_CDATA_DEMUXER 1 @@ -1060,6 +1136,7 @@ %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_MSNWC_TCP_DEMUXER 1 @@ -1168,6 +1245,7 @@ %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 @@ -1175,6 +1253,7 @@ %define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1 %define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1 %define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1 +%define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 1 %define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1 %define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1 %define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1 @@ -1187,6 +1266,7 @@ %define CONFIG_A64MULTI5_ENCODER 0 %define CONFIG_ALIAS_PIX_ENCODER 0 %define CONFIG_AMV_ENCODER 0 +%define CONFIG_APNG_ENCODER 0 %define CONFIG_ASV1_ENCODER 0 %define CONFIG_ASV2_ENCODER 0 %define CONFIG_AVRP_ENCODER 0 @@ -1208,6 +1288,7 @@ %define CONFIG_H261_ENCODER 0 %define CONFIG_H263_ENCODER 0 %define CONFIG_H263P_ENCODER 0 +%define CONFIG_HAP_ENCODER 0 %define CONFIG_HUFFYUV_ENCODER 0 %define CONFIG_JPEG2000_ENCODER 0 %define CONFIG_JPEGLS_ENCODER 0 @@ -1341,13 +1422,24 @@ %define CONFIG_LIBVPX_VP8_ENCODER 0 %define CONFIG_LIBVPX_VP9_ENCODER 0 %define CONFIG_LIBWAVPACK_ENCODER 0 +%define CONFIG_LIBWEBP_ANIM_ENCODER 0 %define CONFIG_LIBWEBP_ENCODER 0 +%define CONFIG_LIBX262_ENCODER 0 %define CONFIG_LIBX264_ENCODER 0 %define CONFIG_LIBX264RGB_ENCODER 0 %define CONFIG_LIBX265_ENCODER 0 %define CONFIG_LIBXAVS_ENCODER 0 %define CONFIG_LIBXVID_ENCODER 0 %define CONFIG_LIBAACPLUS_ENCODER 0 +%define CONFIG_LIBOPENH264_ENCODER 0 +%define CONFIG_H264_QSV_ENCODER 0 +%define CONFIG_NVENC_ENCODER 0 +%define CONFIG_NVENC_H264_ENCODER 0 +%define CONFIG_NVENC_HEVC_ENCODER 0 +%define CONFIG_HEVC_QSV_ENCODER 0 +%define CONFIG_LIBKVAZAAR_ENCODER 0 +%define CONFIG_MPEG2_QSV_ENCODER 0 +%define CONFIG_ACROSSFADE_FILTER 0 %define CONFIG_ADELAY_FILTER 0 %define CONFIG_AECHO_FILTER 0 %define CONFIG_AEVAL_FILTER 0 @@ -1362,6 +1454,7 @@ %define CONFIG_APERMS_FILTER 0 %define CONFIG_APHASER_FILTER 0 %define CONFIG_ARESAMPLE_FILTER 0 +%define CONFIG_AREVERSE_FILTER 0 %define CONFIG_ASELECT_FILTER 0 %define CONFIG_ASENDCMD_FILTER 0 %define CONFIG_ASETNSAMPLES_FILTER 0 @@ -1383,7 +1476,10 @@ %define CONFIG_BS2B_FILTER 0 %define CONFIG_CHANNELMAP_FILTER 0 %define CONFIG_CHANNELSPLIT_FILTER 0 +%define CONFIG_CHORUS_FILTER 0 %define CONFIG_COMPAND_FILTER 0 +%define CONFIG_DCSHIFT_FILTER 0 +%define CONFIG_DYNAUDNORM_FILTER 0 %define CONFIG_EARWAX_FILTER 0 %define CONFIG_EBUR128_FILTER 0 %define CONFIG_EQUALIZER_FILTER 0 @@ -1395,6 +1491,7 @@ %define CONFIG_PAN_FILTER 0 %define CONFIG_REPLAYGAIN_FILTER 0 %define CONFIG_RESAMPLE_FILTER 0 +%define CONFIG_SIDECHAINCOMPRESS_FILTER 0 %define CONFIG_SILENCEDETECT_FILTER 0 %define CONFIG_SILENCEREMOVE_FILTER 0 %define CONFIG_TREBLE_FILTER 0 @@ -1416,31 +1513,44 @@ %define CONFIG_CODECVIEW_FILTER 0 %define CONFIG_COLORBALANCE_FILTER 0 %define CONFIG_COLORCHANNELMIXER_FILTER 0 +%define CONFIG_COLORKEY_FILTER 0 +%define CONFIG_COLORLEVELS_FILTER 0 %define CONFIG_COLORMATRIX_FILTER 0 %define CONFIG_COPY_FILTER 0 +%define CONFIG_COVER_RECT_FILTER 0 %define CONFIG_CROP_FILTER 0 %define CONFIG_CROPDETECT_FILTER 0 %define CONFIG_CURVES_FILTER 0 %define CONFIG_DCTDNOIZ_FILTER 0 +%define CONFIG_DEBAND_FILTER 0 %define CONFIG_DECIMATE_FILTER 0 +%define CONFIG_DEFLATE_FILTER 0 %define CONFIG_DEJUDDER_FILTER 0 %define CONFIG_DELOGO_FILTER 0 %define CONFIG_DESHAKE_FILTER 0 +%define CONFIG_DETELECINE_FILTER 0 +%define CONFIG_DILATION_FILTER 0 %define CONFIG_DRAWBOX_FILTER 0 +%define CONFIG_DRAWGRAPH_FILTER 0 %define CONFIG_DRAWGRID_FILTER 0 %define CONFIG_DRAWTEXT_FILTER 0 %define CONFIG_EDGEDETECT_FILTER 0 %define CONFIG_ELBG_FILTER 0 +%define CONFIG_EQ_FILTER 0 +%define CONFIG_EROSION_FILTER 0 %define CONFIG_EXTRACTPLANES_FILTER 0 %define CONFIG_FADE_FILTER 0 +%define CONFIG_FFTFILT_FILTER 0 %define CONFIG_FIELD_FILTER 0 %define CONFIG_FIELDMATCH_FILTER 0 %define CONFIG_FIELDORDER_FILTER 0 +%define CONFIG_FIND_RECT_FILTER 0 %define CONFIG_FORMAT_FILTER 0 %define CONFIG_FPS_FILTER 0 %define CONFIG_FRAMEPACK_FILTER 0 %define CONFIG_FRAMESTEP_FILTER 0 %define CONFIG_FREI0R_FILTER 0 +%define CONFIG_FSPP_FILTER 0 %define CONFIG_GEQ_FILTER 0 %define CONFIG_GRADFUN_FILTER 0 %define CONFIG_HALDCLUT_FILTER 0 @@ -1452,6 +1562,7 @@ %define CONFIG_HUE_FILTER 0 %define CONFIG_IDET_FILTER 0 %define CONFIG_IL_FILTER 0 +%define CONFIG_INFLATE_FILTER 0 %define CONFIG_INTERLACE_FILTER 0 %define CONFIG_INTERLEAVE_FILTER 0 %define CONFIG_KERNDEINT_FILTER 0 @@ -1462,7 +1573,6 @@ %define CONFIG_LUTYUV_FILTER 0 %define CONFIG_MCDEINT_FILTER 0 %define CONFIG_MERGEPLANES_FILTER 0 -%define CONFIG_MP_FILTER 0 %define CONFIG_MPDECIMATE_FILTER 0 %define CONFIG_NEGATE_FILTER 0 %define CONFIG_NOFORMAT_FILTER 0 @@ -1472,14 +1582,22 @@ %define CONFIG_OVERLAY_FILTER 0 %define CONFIG_OWDENOISE_FILTER 0 %define CONFIG_PAD_FILTER 0 +%define CONFIG_PALETTEGEN_FILTER 0 +%define CONFIG_PALETTEUSE_FILTER 0 %define CONFIG_PERMS_FILTER 0 %define CONFIG_PERSPECTIVE_FILTER 0 %define CONFIG_PHASE_FILTER 0 %define CONFIG_PIXDESCTEST_FILTER 0 %define CONFIG_PP_FILTER 0 +%define CONFIG_PP7_FILTER 0 %define CONFIG_PSNR_FILTER 0 %define CONFIG_PULLUP_FILTER 0 +%define CONFIG_QP_FILTER 0 +%define CONFIG_RANDOM_FILTER 0 +%define CONFIG_REMOVEGRAIN_FILTER 0 %define CONFIG_REMOVELOGO_FILTER 0 +%define CONFIG_REPEATFIELDS_FILTER 0 +%define CONFIG_REVERSE_FILTER 0 %define CONFIG_ROTATE_FILTER 0 %define CONFIG_SAB_FILTER 0 %define CONFIG_SCALE_FILTER 0 @@ -1492,15 +1610,18 @@ %define CONFIG_SETSAR_FILTER 0 %define CONFIG_SETTB_FILTER 0 %define CONFIG_SHOWINFO_FILTER 0 +%define CONFIG_SHOWPALETTE_FILTER 0 %define CONFIG_SHUFFLEPLANES_FILTER 0 %define CONFIG_SIGNALSTATS_FILTER 0 %define CONFIG_SMARTBLUR_FILTER 0 %define CONFIG_SPLIT_FILTER 0 %define CONFIG_SPP_FILTER 0 +%define CONFIG_SSIM_FILTER 0 %define CONFIG_STEREO3D_FILTER 0 %define CONFIG_SUBTITLES_FILTER 0 %define CONFIG_SUPER2XSAI_FILTER 0 %define CONFIG_SWAPUV_FILTER 0 +%define CONFIG_TBLEND_FILTER 0 %define CONFIG_TELECINE_FILTER 0 %define CONFIG_THUMBNAIL_FILTER 0 %define CONFIG_TILE_FILTER 0 @@ -1508,6 +1629,7 @@ %define CONFIG_TRANSPOSE_FILTER 0 %define CONFIG_TRIM_FILTER 0 %define CONFIG_UNSHARP_FILTER 0 +%define CONFIG_USPP_FILTER 0 %define CONFIG_VFLIP_FILTER 0 %define CONFIG_VIDSTABDETECT_FILTER 0 %define CONFIG_VIDSTABTRANSFORM_FILTER 0 @@ -1530,31 +1652,46 @@ %define CONFIG_SMPTEHDBARS_FILTER 0 %define CONFIG_TESTSRC_FILTER 0 %define CONFIG_NULLSINK_FILTER 0 +%define CONFIG_ADRAWGRAPH_FILTER 0 %define CONFIG_AVECTORSCOPE_FILTER 0 %define CONFIG_CONCAT_FILTER 0 %define CONFIG_SHOWCQT_FILTER 0 %define CONFIG_SHOWSPECTRUM_FILTER 0 +%define CONFIG_SHOWVOLUME_FILTER 0 %define CONFIG_SHOWWAVES_FILTER 0 +%define CONFIG_SHOWWAVESPIC_FILTER 0 %define CONFIG_AMOVIE_FILTER 0 %define CONFIG_MOVIE_FILTER 0 %define CONFIG_H263_VAAPI_HWACCEL 0 %define CONFIG_H263_VDPAU_HWACCEL 0 +%define CONFIG_H264_D3D11VA_HWACCEL 0 %define CONFIG_H264_DXVA2_HWACCEL 0 +%define CONFIG_H264_MMAL_HWACCEL 0 +%define CONFIG_H264_QSV_HWACCEL 0 %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_HEVC_D3D11VA_HWACCEL 0 +%define CONFIG_HEVC_DXVA2_HWACCEL 0 +%define CONFIG_HEVC_QSV_HWACCEL 0 +%define CONFIG_HEVC_VDPAU_HWACCEL 0 %define CONFIG_MPEG1_XVMC_HWACCEL 0 %define CONFIG_MPEG1_VDPAU_HWACCEL 0 %define CONFIG_MPEG2_XVMC_HWACCEL 0 +%define CONFIG_MPEG2_D3D11VA_HWACCEL 0 %define CONFIG_MPEG2_DXVA2_HWACCEL 0 +%define CONFIG_MPEG2_QSV_HWACCEL 0 %define CONFIG_MPEG2_VAAPI_HWACCEL 0 %define CONFIG_MPEG2_VDPAU_HWACCEL 0 %define CONFIG_MPEG4_VAAPI_HWACCEL 0 %define CONFIG_MPEG4_VDPAU_HWACCEL 0 +%define CONFIG_VC1_D3D11VA_HWACCEL 0 %define CONFIG_VC1_DXVA2_HWACCEL 0 %define CONFIG_VC1_VAAPI_HWACCEL 0 %define CONFIG_VC1_VDPAU_HWACCEL 0 +%define CONFIG_VC1_QSV_HWACCEL 0 +%define CONFIG_WMV3_D3D11VA_HWACCEL 0 %define CONFIG_WMV3_DXVA2_HWACCEL 0 %define CONFIG_WMV3_VAAPI_HWACCEL 0 %define CONFIG_WMV3_VDPAU_HWACCEL 0 @@ -1586,6 +1723,7 @@ %define CONFIG_ADX_MUXER 0 %define CONFIG_AIFF_MUXER 0 %define CONFIG_AMR_MUXER 0 +%define CONFIG_APNG_MUXER 0 %define CONFIG_ASF_MUXER 0 %define CONFIG_ASS_MUXER 0 %define CONFIG_AST_MUXER 0 @@ -1657,6 +1795,7 @@ %define CONFIG_MPJPEG_MUXER 0 %define CONFIG_MXF_MUXER 0 %define CONFIG_MXF_D10_MUXER 0 +%define CONFIG_MXF_OPATOM_MUXER 0 %define CONFIG_NULL_MUXER 0 %define CONFIG_NUT_MUXER 0 %define CONFIG_OGA_MUXER 0 @@ -1689,10 +1828,12 @@ %define CONFIG_ROQ_MUXER 0 %define CONFIG_RSO_MUXER 0 %define CONFIG_RTP_MUXER 0 +%define CONFIG_RTP_MPEGTS_MUXER 0 %define CONFIG_RTSP_MUXER 0 %define CONFIG_SAP_MUXER 0 %define CONFIG_SEGMENT_MUXER 0 %define CONFIG_STREAM_SEGMENT_MUXER 0 +%define CONFIG_SINGLEJPEG_MUXER 0 %define CONFIG_SMJPEG_MUXER 0 %define CONFIG_SMOOTHSTREAMING_MUXER 0 %define CONFIG_SOX_MUXER 0 @@ -1713,6 +1854,7 @@ %define CONFIG_WAV_MUXER 0 %define CONFIG_WEBM_MUXER 0 %define CONFIG_WEBM_DASH_MANIFEST_MUXER 0 +%define CONFIG_WEBM_CHUNK_MUXER 0 %define CONFIG_WEBP_MUXER 0 %define CONFIG_WEBVTT_MUXER 0 %define CONFIG_WTV_MUXER 0 @@ -1766,6 +1908,7 @@ %define CONFIG_VP3_PARSER 1 %define CONFIG_VP8_PARSER 1 %define CONFIG_VP9_PARSER 1 +%define CONFIG_ASYNC_PROTOCOL 0 %define CONFIG_BLURAY_PROTOCOL 0 %define CONFIG_CACHE_PROTOCOL 1 %define CONFIG_CONCAT_PROTOCOL 1 @@ -1796,7 +1939,9 @@ %define CONFIG_SRTP_PROTOCOL 0 %define CONFIG_SUBFILE_PROTOCOL 1 %define CONFIG_TCP_PROTOCOL 0 -%define CONFIG_TLS_PROTOCOL 0 +%define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0 +%define CONFIG_TLS_GNUTLS_PROTOCOL 0 +%define CONFIG_TLS_OPENSSL_PROTOCOL 0 %define CONFIG_UDP_PROTOCOL 0 %define CONFIG_UDPLITE_PROTOCOL 0 %define CONFIG_UNIX_PROTOCOL 0 diff --git a/build/ffmpeg/config-x86.h b/build/ffmpeg/config-x86.h index 53be7b59c..f8f71992a 100644 --- a/build/ffmpeg/config-x86.h +++ b/build/ffmpeg/config-x86.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H -#define FFMPEG_CONFIGURATION "--disable-avfilter --disable-avresample --disable-bzlib --disable-decoder='atrac3p,indeo2,indeo3,indeo4,indeo5,twinvq' --disable-devices --disable-doc --disable-encoders --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-filters --disable-hwaccels --disable-muxers --disable-network --disable-postproc --disable-pthreads --disable-shared --enable-gpl --enable-runtime-cpudetect --enable-static --enable-zlib --extra-cflags=-D_SYSCRT --extra-cflags=-I../../include --extra-cflags=-MD --extra-cflags=-wd4005 --extra-cflags=-wd4189 --extra-ldflags='-LIBPATH:../../lib/Win32/Release' --toolchain=msvc" +#define FFMPEG_CONFIGURATION "--disable-avfilter --disable-avresample --disable-bzlib --disable-d3d11va --disable-dxva2 --disable-decoder='atrac3p,indeo2,indeo3,indeo4,indeo5,twinvq' --disable-devices --disable-doc --disable-encoders --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-filters --disable-hwaccels --disable-muxers --disable-network --disable-postproc --disable-pthreads --disable-shared --enable-gpl --enable-runtime-cpudetect --enable-static --enable-zlib --extra-cflags=-D_SYSCRT --extra-cflags=-I../../include --extra-cflags=-MD --extra-cflags=-wd4005 --extra-cflags=-wd4189 --extra-ldflags='-LIBPATH:../../lib/Win32/Release' --toolchain=msvc" #define FFMPEG_LICENSE "GPL version 2 or later" -#define CONFIG_THIS_YEAR 2014 +#define CONFIG_THIS_YEAR 2015 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" -#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 18.00.31101 for x86" +#define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 19.00.23026 for x86" #define av_restrict __restrict #define EXTERN_PREFIX "_" #define EXTERN_ASM _ @@ -47,8 +47,9 @@ #define HAVE_VFPV3 0 #define HAVE_SETEND 0 #define HAVE_ALTIVEC 0 -#define HAVE_DCBZL 1 -#define HAVE_LDBRX 1 +#define HAVE_DCBZL 0 +#define HAVE_LDBRX 0 +#define HAVE_POWER8 0 #define HAVE_PPC4XX 0 #define HAVE_VSX 0 #define HAVE_AMD3DNOW 1 @@ -70,9 +71,14 @@ #define HAVE_I686 1 #define HAVE_MIPSFPU 0 #define HAVE_MIPS32R2 0 +#define HAVE_MIPS32R5 0 +#define HAVE_MIPS64R6 0 #define HAVE_MIPSDSPR1 0 #define HAVE_MIPSDSPR2 0 -#define HAVE_LOONGSON 1 +#define HAVE_MSA 0 +#define HAVE_LOONGSON2 1 +#define HAVE_LOONGSON3 1 +#define HAVE_MMI 0 #define HAVE_ARMV5TE_EXTERNAL 0 #define HAVE_ARMV6_EXTERNAL 0 #define HAVE_ARMV6T2_EXTERNAL 0 @@ -84,6 +90,7 @@ #define HAVE_ALTIVEC_EXTERNAL 0 #define HAVE_DCBZL_EXTERNAL 0 #define HAVE_LDBRX_EXTERNAL 0 +#define HAVE_POWER8_EXTERNAL 0 #define HAVE_PPC4XX_EXTERNAL 0 #define HAVE_VSX_EXTERNAL 0 #define HAVE_AMD3DNOW_EXTERNAL 1 @@ -105,9 +112,14 @@ #define HAVE_I686_EXTERNAL 0 #define HAVE_MIPSFPU_EXTERNAL 0 #define HAVE_MIPS32R2_EXTERNAL 0 +#define HAVE_MIPS32R5_EXTERNAL 0 +#define HAVE_MIPS64R6_EXTERNAL 0 #define HAVE_MIPSDSPR1_EXTERNAL 0 #define HAVE_MIPSDSPR2_EXTERNAL 0 -#define HAVE_LOONGSON_EXTERNAL 0 +#define HAVE_MSA_EXTERNAL 0 +#define HAVE_LOONGSON2_EXTERNAL 0 +#define HAVE_LOONGSON3_EXTERNAL 0 +#define HAVE_MMI_EXTERNAL 0 #define HAVE_ARMV5TE_INLINE 0 #define HAVE_ARMV6_INLINE 0 #define HAVE_ARMV6T2_INLINE 0 @@ -119,6 +131,7 @@ #define HAVE_ALTIVEC_INLINE 0 #define HAVE_DCBZL_INLINE 0 #define HAVE_LDBRX_INLINE 0 +#define HAVE_POWER8_INLINE 0 #define HAVE_PPC4XX_INLINE 0 #define HAVE_VSX_INLINE 0 #define HAVE_AMD3DNOW_INLINE 0 @@ -140,9 +153,14 @@ #define HAVE_I686_INLINE 0 #define HAVE_MIPSFPU_INLINE 0 #define HAVE_MIPS32R2_INLINE 0 +#define HAVE_MIPS32R5_INLINE 0 +#define HAVE_MIPS64R6_INLINE 0 #define HAVE_MIPSDSPR1_INLINE 0 #define HAVE_MIPSDSPR2_INLINE 0 -#define HAVE_LOONGSON_INLINE 0 +#define HAVE_MSA_INLINE 0 +#define HAVE_LOONGSON2_INLINE 0 +#define HAVE_LOONGSON3_INLINE 0 +#define HAVE_MMI_INLINE 0 #define HAVE_ALIGNED_STACK 0 #define HAVE_FAST_64BIT 0 #define HAVE_FAST_CLZ 1 @@ -174,7 +192,6 @@ #define HAVE_ASM_TYPES_H 0 #define HAVE_CDIO_PARANOIA_H 0 #define HAVE_CDIO_PARANOIA_PARANOIA_H 0 -#define HAVE_CL_CL_H 0 #define HAVE_DEV_BKTR_IOCTL_BT848_H 0 #define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 #define HAVE_DEV_IC_BT8XX_H 0 @@ -182,6 +199,7 @@ #define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0 #define HAVE_DIRECT_H 1 #define HAVE_DLFCN_H 0 +#define HAVE_D3D11_H 1 #define HAVE_DXVA_H 1 #define HAVE_ES2_GL_H 0 #define HAVE_GSM_H 0 @@ -206,6 +224,7 @@ #define HAVE_TERMIOS_H 0 #define HAVE_UDPLITE_H 0 #define HAVE_UNISTD_H 0 +#define HAVE_VALGRIND_VALGRIND_H 0 #define HAVE_WINDOWS_H 1 #define HAVE_WINSOCK2_H 0 #define HAVE_INTRINSICS_NEON 0 @@ -213,7 +232,9 @@ #define HAVE_ATAN2F 1 #define HAVE_CBRT 1 #define HAVE_CBRTF 1 +#define HAVE_COPYSIGN 1 #define HAVE_COSF 1 +#define HAVE_ERF 1 #define HAVE_EXP2 1 #define HAVE_EXP2F 1 #define HAVE_EXPF 1 @@ -266,7 +287,6 @@ #define HAVE_LZO1X_999_COMPRESS 0 #define HAVE_MACH_ABSOLUTE_TIME 0 #define HAVE_MAPVIEWOFFILE 1 -#define HAVE_MOVEFILEEXA 1 #define HAVE_MEMALIGN 0 #define HAVE_MKSTEMP 0 #define HAVE_MMAP 0 @@ -277,6 +297,7 @@ #define HAVE_PTHREAD_CANCEL 0 #define HAVE_SCHED_GETAFFINITY 0 #define HAVE_SETCONSOLETEXTATTRIBUTE 1 +#define HAVE_SETCONSOLECTRLHANDLER 1 #define HAVE_SETMODE 1 #define HAVE_SETRLIMIT 0 #define HAVE_SLEEP 1 @@ -291,6 +312,7 @@ #define HAVE_W32THREADS 1 #define HAVE_AS_DN_DIRECTIVE 0 #define HAVE_AS_FUNC 0 +#define HAVE_AS_OBJECT_ARCH 0 #define HAVE_ASM_MOD_Q 0 #define HAVE_ATTRIBUTE_MAY_ALIAS 0 #define HAVE_ATTRIBUTE_PACKED 0 @@ -312,6 +334,7 @@ #define HAVE_CONDITION_VARIABLE_PTR 1 #define HAVE_SOCKLEN_T 0 #define HAVE_STRUCT_ADDRINFO 0 +#define HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING 0 #define HAVE_STRUCT_GROUP_SOURCE_REQ 0 #define HAVE_STRUCT_IP_MREQ_SOURCE 0 #define HAVE_STRUCT_IPV6_MREQ 0 @@ -326,7 +349,7 @@ #define HAVE_ATOMICS_NATIVE 1 #define HAVE_DOS_PATHS 1 #define HAVE_DXVA2API_COBJ 1 -#define HAVE_DXVA2_LIB 1 +#define HAVE_DXVA2_LIB 0 #define HAVE_LIBC_MSVCRT 1 #define HAVE_LIBDC1394_1 0 #define HAVE_LIBDC1394_2 0 @@ -335,8 +358,10 @@ #define HAVE_PERL 1 #define HAVE_POD2MAN 0 #define HAVE_SDL 0 +#define HAVE_SECTION_DATA_REL_RO 0 #define HAVE_TEXI2HTML 0 #define HAVE_THREADS 1 +#define HAVE_VAAPI_X11 0 #define HAVE_VDPAU_X11 0 #define HAVE_XLIB 0 #define CONFIG_BSFS 1 @@ -356,6 +381,7 @@ #define CONFIG_PODPAGES 1 #define CONFIG_TXTPAGES 1 #define CONFIG_AVIO_READING_EXAMPLE 1 +#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1 #define CONFIG_DECODING_ENCODING_EXAMPLE 1 #define CONFIG_DEMUXING_DECODING_EXAMPLE 1 #define CONFIG_EXTRACT_MVS_EXAMPLE 1 @@ -364,6 +390,7 @@ #define CONFIG_FILTERING_VIDEO_EXAMPLE 0 #define CONFIG_METADATA_EXAMPLE 1 #define CONFIG_MUXING_EXAMPLE 1 +#define CONFIG_QSVDEC_EXAMPLE 0 #define CONFIG_REMUXING_EXAMPLE 1 #define CONFIG_RESAMPLING_AUDIO_EXAMPLE 1 #define CONFIG_SCALING_VIDEO_EXAMPLE 1 @@ -385,6 +412,7 @@ #define CONFIG_LIBCDIO 0 #define CONFIG_LIBCELT 0 #define CONFIG_LIBDC1394 0 +#define CONFIG_LIBDCADEC 0 #define CONFIG_LIBFAAC 0 #define CONFIG_LIBFDK_AAC 0 #define CONFIG_LIBFLITE 0 @@ -395,12 +423,15 @@ #define CONFIG_LIBGSM 0 #define CONFIG_LIBIEC61883 0 #define CONFIG_LIBILBC 0 +#define CONFIG_LIBKVAZAAR 0 +#define CONFIG_LIBMFX 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_LIBOPENH264 0 #define CONFIG_LIBOPENJPEG 0 #define CONFIG_LIBOPUS 0 #define CONFIG_LIBPULSE 0 @@ -409,6 +440,7 @@ #define CONFIG_LIBSCHROEDINGER 0 #define CONFIG_LIBSHINE 0 #define CONFIG_LIBSMBCLIENT 0 +#define CONFIG_LIBSNAPPY 0 #define CONFIG_LIBSOXR 0 #define CONFIG_LIBSPEEX 0 #define CONFIG_LIBSSH 0 @@ -435,11 +467,14 @@ #define CONFIG_LIBZMQ 0 #define CONFIG_LIBZVBI 0 #define CONFIG_LZMA 0 +#define CONFIG_MMAL 0 +#define CONFIG_NVENC 0 #define CONFIG_OPENAL 0 #define CONFIG_OPENCL 0 #define CONFIG_OPENGL 0 #define CONFIG_OPENSSL 0 #define CONFIG_SDL 0 +#define CONFIG_SECURETRANSPORT 0 #define CONFIG_X11GRAB 0 #define CONFIG_XLIB 0 #define CONFIG_ZLIB 1 @@ -452,7 +487,8 @@ #define CONFIG_SMALL 0 #define CONFIG_STATIC 1 #define CONFIG_SWSCALE_ALPHA 1 -#define CONFIG_DXVA2 1 +#define CONFIG_D3D11VA 0 +#define CONFIG_DXVA2 0 #define CONFIG_VAAPI 0 #define CONFIG_VDA 0 #define CONFIG_VDPAU 0 @@ -494,6 +530,7 @@ #define CONFIG_POD2MAN 0 #define CONFIG_RAISE_MAJOR 0 #define CONFIG_THUMB 0 +#define CONFIG_VALGRIND_BACKTRACE 0 #define CONFIG_XMM_CLOBBER_TEST 0 #define CONFIG_AANDCTTABLES 1 #define CONFIG_AC3DSP 1 @@ -507,8 +544,12 @@ #define CONFIG_FAANDCT 1 #define CONFIG_FAANIDCT 1 #define CONFIG_FDCTDSP 1 +#define CONFIG_FLACDSP 1 +#define CONFIG_FMTCONVERT 1 #define CONFIG_FRAME_THREAD_ENCODER 0 +#define CONFIG_G722DSP 1 #define CONFIG_GCRYPT 0 +#define CONFIG_GMP 0 #define CONFIG_GOLOMB 1 #define CONFIG_GPLV3 0 #define CONFIG_H263DSP 1 @@ -522,7 +563,11 @@ #define CONFIG_HUFFYUVENCDSP 0 #define CONFIG_IDCTDSP 1 #define CONFIG_IIRFILTER 0 +#define CONFIG_IMDCT15 1 #define CONFIG_INTRAX8 1 +#define CONFIG_IVIDSP 0 +#define CONFIG_JPEGTABLES 1 +#define CONFIG_LIBX262 0 #define CONFIG_LGPLV3 0 #define CONFIG_LLAUDDSP 1 #define CONFIG_LLVIDDSP 1 @@ -533,28 +578,40 @@ #define CONFIG_MPEGAUDIODSP 1 #define CONFIG_MPEGVIDEO 1 #define CONFIG_MPEGVIDEOENC 1 -#define CONFIG_NETTLE 0 +#define CONFIG_MSS34DSP 1 #define CONFIG_PIXBLOCKDSP 1 #define CONFIG_QPELDSP 1 +#define CONFIG_QSV 0 +#define CONFIG_QSVDEC 0 +#define CONFIG_QSVENC 0 #define CONFIG_RANGECODER 1 #define CONFIG_RIFFDEC 1 #define CONFIG_RIFFENC 0 #define CONFIG_RTPDEC 0 #define CONFIG_RTPENC_CHAIN 0 +#define CONFIG_RV34DSP 1 #define CONFIG_SINEWIN 1 +#define CONFIG_SNAPPY 1 #define CONFIG_STARTCODE 1 +#define CONFIG_TEXTUREDSP 1 +#define CONFIG_TEXTUREDSPENC 0 #define CONFIG_TPELDSP 1 #define CONFIG_VIDEODSP 1 #define CONFIG_VP3DSP 1 +#define CONFIG_VP56DSP 1 +#define CONFIG_VP8DSP 1 #define CONFIG_WMA_FREQS 1 +#define CONFIG_WMV2DSP 1 #define CONFIG_AAC_ADTSTOASC_BSF 1 #define CONFIG_CHOMP_BSF 1 #define CONFIG_DUMP_EXTRADATA_BSF 1 #define CONFIG_H264_MP4TOANNEXB_BSF 1 +#define CONFIG_HEVC_MP4TOANNEXB_BSF 1 #define CONFIG_IMX_DUMP_HEADER_BSF 1 #define CONFIG_MJPEG2JPEG_BSF 1 #define CONFIG_MJPEGA_DUMP_HEADER_BSF 1 #define CONFIG_MP3_HEADER_DECOMPRESS_BSF 1 +#define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 1 #define CONFIG_MOV2TEXTSUB_BSF 1 #define CONFIG_NOISE_BSF 1 #define CONFIG_REMOVE_EXTRADATA_BSF 1 @@ -592,6 +649,7 @@ #define CONFIG_CPIA_DECODER 1 #define CONFIG_CSCD_DECODER 1 #define CONFIG_CYUV_DECODER 1 +#define CONFIG_DDS_DECODER 1 #define CONFIG_DFA_DECODER 1 #define CONFIG_DIRAC_DECODER 1 #define CONFIG_DNXHD_DECODER 1 @@ -629,10 +687,16 @@ #define CONFIG_H263P_DECODER 1 #define CONFIG_H264_DECODER 1 #define CONFIG_H264_CRYSTALHD_DECODER 0 +#define CONFIG_H264_MMAL_DECODER 0 +#define CONFIG_H264_QSV_DECODER 0 #define CONFIG_H264_VDA_DECODER 0 #define CONFIG_H264_VDPAU_DECODER 0 +#define CONFIG_HAP_DECODER 1 #define CONFIG_HEVC_DECODER 1 +#define CONFIG_HEVC_QSV_DECODER 0 #define CONFIG_HNM4_VIDEO_DECODER 1 +#define CONFIG_HQ_HQA_DECODER 1 +#define CONFIG_HQX_DECODER 1 #define CONFIG_HUFFYUV_DECODER 1 #define CONFIG_IDCIN_DECODER 1 #define CONFIG_IFF_BYTERUN1_DECODER 1 @@ -665,6 +729,7 @@ #define CONFIG_MPEG_VDPAU_DECODER 0 #define CONFIG_MPEG1_VDPAU_DECODER 0 #define CONFIG_MPEG2_CRYSTALHD_DECODER 0 +#define CONFIG_MPEG2_QSV_DECODER 0 #define CONFIG_MSA1_DECODER 1 #define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0 #define CONFIG_MSMPEG4V1_DECODER 1 @@ -719,6 +784,7 @@ #define CONFIG_SVQ3_DECODER 1 #define CONFIG_TARGA_DECODER 1 #define CONFIG_TARGA_Y216_DECODER 1 +#define CONFIG_TDSC_DECODER 1 #define CONFIG_THEORA_DECODER 1 #define CONFIG_THP_DECODER 1 #define CONFIG_TIERTEXSEQVIDEO_DECODER 1 @@ -742,6 +808,7 @@ #define CONFIG_VC1_CRYSTALHD_DECODER 0 #define CONFIG_VC1_VDPAU_DECODER 0 #define CONFIG_VC1IMAGE_DECODER 1 +#define CONFIG_VC1_QSV_DECODER 0 #define CONFIG_VCR1_DECODER 1 #define CONFIG_VMDVIDEO_DECODER 1 #define CONFIG_VMNC_DECODER 1 @@ -776,6 +843,7 @@ #define CONFIG_ZLIB_DECODER 1 #define CONFIG_ZMBV_DECODER 1 #define CONFIG_AAC_DECODER 1 +#define CONFIG_AAC_FIXED_DECODER 1 #define CONFIG_AAC_LATM_DECODER 1 #define CONFIG_AC3_DECODER 1 #define CONFIG_AC3_FIXED_DECODER 1 @@ -797,6 +865,7 @@ #define CONFIG_DSD_LSBF_PLANAR_DECODER 1 #define CONFIG_DSD_MSBF_PLANAR_DECODER 1 #define CONFIG_DSICINAUDIO_DECODER 1 +#define CONFIG_DSS_SP_DECODER 1 #define CONFIG_EAC3_DECODER 1 #define CONFIG_EVRC_DECODER 1 #define CONFIG_FFWAVESYNTH_DECODER 1 @@ -917,12 +986,14 @@ #define CONFIG_ADPCM_SBPRO_4_DECODER 1 #define CONFIG_ADPCM_SWF_DECODER 1 #define CONFIG_ADPCM_THP_DECODER 1 +#define CONFIG_ADPCM_THP_LE_DECODER 1 #define CONFIG_ADPCM_VIMA_DECODER 1 #define CONFIG_ADPCM_XA_DECODER 1 #define CONFIG_ADPCM_YAMAHA_DECODER 1 #define CONFIG_VIMA_DECODER 1 #define CONFIG_SSA_DECODER 1 #define CONFIG_ASS_DECODER 1 +#define CONFIG_CCAPTION_DECODER 1 #define CONFIG_DVBSUB_DECODER 1 #define CONFIG_DVDSUB_DECODER 1 #define CONFIG_JACOSUB_DECODER 1 @@ -943,6 +1014,7 @@ #define CONFIG_WEBVTT_DECODER 1 #define CONFIG_XSUB_DECODER 1 #define CONFIG_LIBCELT_DECODER 0 +#define CONFIG_LIBDCADEC_DECODER 0 #define CONFIG_LIBFDK_AAC_DECODER 0 #define CONFIG_LIBGSM_DECODER 0 #define CONFIG_LIBGSM_MS_DECODER 0 @@ -978,6 +1050,7 @@ #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 @@ -991,6 +1064,7 @@ #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 @@ -1007,9 +1081,11 @@ #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_DXA_DEMUXER 1 #define CONFIG_EA_DEMUXER 1 #define CONFIG_EA_CDATA_DEMUXER 1 @@ -1076,6 +1152,7 @@ #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_MSNWC_TCP_DEMUXER 1 @@ -1184,6 +1261,7 @@ #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 @@ -1191,6 +1269,7 @@ #define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 1 #define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 1 #define CONFIG_IMAGE_PNG_PIPE_DEMUXER 1 +#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 1 #define CONFIG_IMAGE_SGI_PIPE_DEMUXER 1 #define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 1 #define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 1 @@ -1203,6 +1282,7 @@ #define CONFIG_A64MULTI5_ENCODER 0 #define CONFIG_ALIAS_PIX_ENCODER 0 #define CONFIG_AMV_ENCODER 0 +#define CONFIG_APNG_ENCODER 0 #define CONFIG_ASV1_ENCODER 0 #define CONFIG_ASV2_ENCODER 0 #define CONFIG_AVRP_ENCODER 0 @@ -1224,6 +1304,7 @@ #define CONFIG_H261_ENCODER 0 #define CONFIG_H263_ENCODER 0 #define CONFIG_H263P_ENCODER 0 +#define CONFIG_HAP_ENCODER 0 #define CONFIG_HUFFYUV_ENCODER 0 #define CONFIG_JPEG2000_ENCODER 0 #define CONFIG_JPEGLS_ENCODER 0 @@ -1357,13 +1438,24 @@ #define CONFIG_LIBVPX_VP8_ENCODER 0 #define CONFIG_LIBVPX_VP9_ENCODER 0 #define CONFIG_LIBWAVPACK_ENCODER 0 +#define CONFIG_LIBWEBP_ANIM_ENCODER 0 #define CONFIG_LIBWEBP_ENCODER 0 +#define CONFIG_LIBX262_ENCODER 0 #define CONFIG_LIBX264_ENCODER 0 #define CONFIG_LIBX264RGB_ENCODER 0 #define CONFIG_LIBX265_ENCODER 0 #define CONFIG_LIBXAVS_ENCODER 0 #define CONFIG_LIBXVID_ENCODER 0 #define CONFIG_LIBAACPLUS_ENCODER 0 +#define CONFIG_LIBOPENH264_ENCODER 0 +#define CONFIG_H264_QSV_ENCODER 0 +#define CONFIG_NVENC_ENCODER 0 +#define CONFIG_NVENC_H264_ENCODER 0 +#define CONFIG_NVENC_HEVC_ENCODER 0 +#define CONFIG_HEVC_QSV_ENCODER 0 +#define CONFIG_LIBKVAZAAR_ENCODER 0 +#define CONFIG_MPEG2_QSV_ENCODER 0 +#define CONFIG_ACROSSFADE_FILTER 0 #define CONFIG_ADELAY_FILTER 0 #define CONFIG_AECHO_FILTER 0 #define CONFIG_AEVAL_FILTER 0 @@ -1378,6 +1470,7 @@ #define CONFIG_APERMS_FILTER 0 #define CONFIG_APHASER_FILTER 0 #define CONFIG_ARESAMPLE_FILTER 0 +#define CONFIG_AREVERSE_FILTER 0 #define CONFIG_ASELECT_FILTER 0 #define CONFIG_ASENDCMD_FILTER 0 #define CONFIG_ASETNSAMPLES_FILTER 0 @@ -1399,7 +1492,10 @@ #define CONFIG_BS2B_FILTER 0 #define CONFIG_CHANNELMAP_FILTER 0 #define CONFIG_CHANNELSPLIT_FILTER 0 +#define CONFIG_CHORUS_FILTER 0 #define CONFIG_COMPAND_FILTER 0 +#define CONFIG_DCSHIFT_FILTER 0 +#define CONFIG_DYNAUDNORM_FILTER 0 #define CONFIG_EARWAX_FILTER 0 #define CONFIG_EBUR128_FILTER 0 #define CONFIG_EQUALIZER_FILTER 0 @@ -1411,6 +1507,7 @@ #define CONFIG_PAN_FILTER 0 #define CONFIG_REPLAYGAIN_FILTER 0 #define CONFIG_RESAMPLE_FILTER 0 +#define CONFIG_SIDECHAINCOMPRESS_FILTER 0 #define CONFIG_SILENCEDETECT_FILTER 0 #define CONFIG_SILENCEREMOVE_FILTER 0 #define CONFIG_TREBLE_FILTER 0 @@ -1432,31 +1529,44 @@ #define CONFIG_CODECVIEW_FILTER 0 #define CONFIG_COLORBALANCE_FILTER 0 #define CONFIG_COLORCHANNELMIXER_FILTER 0 +#define CONFIG_COLORKEY_FILTER 0 +#define CONFIG_COLORLEVELS_FILTER 0 #define CONFIG_COLORMATRIX_FILTER 0 #define CONFIG_COPY_FILTER 0 +#define CONFIG_COVER_RECT_FILTER 0 #define CONFIG_CROP_FILTER 0 #define CONFIG_CROPDETECT_FILTER 0 #define CONFIG_CURVES_FILTER 0 #define CONFIG_DCTDNOIZ_FILTER 0 +#define CONFIG_DEBAND_FILTER 0 #define CONFIG_DECIMATE_FILTER 0 +#define CONFIG_DEFLATE_FILTER 0 #define CONFIG_DEJUDDER_FILTER 0 #define CONFIG_DELOGO_FILTER 0 #define CONFIG_DESHAKE_FILTER 0 +#define CONFIG_DETELECINE_FILTER 0 +#define CONFIG_DILATION_FILTER 0 #define CONFIG_DRAWBOX_FILTER 0 +#define CONFIG_DRAWGRAPH_FILTER 0 #define CONFIG_DRAWGRID_FILTER 0 #define CONFIG_DRAWTEXT_FILTER 0 #define CONFIG_EDGEDETECT_FILTER 0 #define CONFIG_ELBG_FILTER 0 +#define CONFIG_EQ_FILTER 0 +#define CONFIG_EROSION_FILTER 0 #define CONFIG_EXTRACTPLANES_FILTER 0 #define CONFIG_FADE_FILTER 0 +#define CONFIG_FFTFILT_FILTER 0 #define CONFIG_FIELD_FILTER 0 #define CONFIG_FIELDMATCH_FILTER 0 #define CONFIG_FIELDORDER_FILTER 0 +#define CONFIG_FIND_RECT_FILTER 0 #define CONFIG_FORMAT_FILTER 0 #define CONFIG_FPS_FILTER 0 #define CONFIG_FRAMEPACK_FILTER 0 #define CONFIG_FRAMESTEP_FILTER 0 #define CONFIG_FREI0R_FILTER 0 +#define CONFIG_FSPP_FILTER 0 #define CONFIG_GEQ_FILTER 0 #define CONFIG_GRADFUN_FILTER 0 #define CONFIG_HALDCLUT_FILTER 0 @@ -1468,6 +1578,7 @@ #define CONFIG_HUE_FILTER 0 #define CONFIG_IDET_FILTER 0 #define CONFIG_IL_FILTER 0 +#define CONFIG_INFLATE_FILTER 0 #define CONFIG_INTERLACE_FILTER 0 #define CONFIG_INTERLEAVE_FILTER 0 #define CONFIG_KERNDEINT_FILTER 0 @@ -1478,7 +1589,6 @@ #define CONFIG_LUTYUV_FILTER 0 #define CONFIG_MCDEINT_FILTER 0 #define CONFIG_MERGEPLANES_FILTER 0 -#define CONFIG_MP_FILTER 0 #define CONFIG_MPDECIMATE_FILTER 0 #define CONFIG_NEGATE_FILTER 0 #define CONFIG_NOFORMAT_FILTER 0 @@ -1488,14 +1598,22 @@ #define CONFIG_OVERLAY_FILTER 0 #define CONFIG_OWDENOISE_FILTER 0 #define CONFIG_PAD_FILTER 0 +#define CONFIG_PALETTEGEN_FILTER 0 +#define CONFIG_PALETTEUSE_FILTER 0 #define CONFIG_PERMS_FILTER 0 #define CONFIG_PERSPECTIVE_FILTER 0 #define CONFIG_PHASE_FILTER 0 #define CONFIG_PIXDESCTEST_FILTER 0 #define CONFIG_PP_FILTER 0 +#define CONFIG_PP7_FILTER 0 #define CONFIG_PSNR_FILTER 0 #define CONFIG_PULLUP_FILTER 0 +#define CONFIG_QP_FILTER 0 +#define CONFIG_RANDOM_FILTER 0 +#define CONFIG_REMOVEGRAIN_FILTER 0 #define CONFIG_REMOVELOGO_FILTER 0 +#define CONFIG_REPEATFIELDS_FILTER 0 +#define CONFIG_REVERSE_FILTER 0 #define CONFIG_ROTATE_FILTER 0 #define CONFIG_SAB_FILTER 0 #define CONFIG_SCALE_FILTER 0 @@ -1508,15 +1626,18 @@ #define CONFIG_SETSAR_FILTER 0 #define CONFIG_SETTB_FILTER 0 #define CONFIG_SHOWINFO_FILTER 0 +#define CONFIG_SHOWPALETTE_FILTER 0 #define CONFIG_SHUFFLEPLANES_FILTER 0 #define CONFIG_SIGNALSTATS_FILTER 0 #define CONFIG_SMARTBLUR_FILTER 0 #define CONFIG_SPLIT_FILTER 0 #define CONFIG_SPP_FILTER 0 +#define CONFIG_SSIM_FILTER 0 #define CONFIG_STEREO3D_FILTER 0 #define CONFIG_SUBTITLES_FILTER 0 #define CONFIG_SUPER2XSAI_FILTER 0 #define CONFIG_SWAPUV_FILTER 0 +#define CONFIG_TBLEND_FILTER 0 #define CONFIG_TELECINE_FILTER 0 #define CONFIG_THUMBNAIL_FILTER 0 #define CONFIG_TILE_FILTER 0 @@ -1524,6 +1645,7 @@ #define CONFIG_TRANSPOSE_FILTER 0 #define CONFIG_TRIM_FILTER 0 #define CONFIG_UNSHARP_FILTER 0 +#define CONFIG_USPP_FILTER 0 #define CONFIG_VFLIP_FILTER 0 #define CONFIG_VIDSTABDETECT_FILTER 0 #define CONFIG_VIDSTABTRANSFORM_FILTER 0 @@ -1546,31 +1668,46 @@ #define CONFIG_SMPTEHDBARS_FILTER 0 #define CONFIG_TESTSRC_FILTER 0 #define CONFIG_NULLSINK_FILTER 0 +#define CONFIG_ADRAWGRAPH_FILTER 0 #define CONFIG_AVECTORSCOPE_FILTER 0 #define CONFIG_CONCAT_FILTER 0 #define CONFIG_SHOWCQT_FILTER 0 #define CONFIG_SHOWSPECTRUM_FILTER 0 +#define CONFIG_SHOWVOLUME_FILTER 0 #define CONFIG_SHOWWAVES_FILTER 0 +#define CONFIG_SHOWWAVESPIC_FILTER 0 #define CONFIG_AMOVIE_FILTER 0 #define CONFIG_MOVIE_FILTER 0 #define CONFIG_H263_VAAPI_HWACCEL 0 #define CONFIG_H263_VDPAU_HWACCEL 0 +#define CONFIG_H264_D3D11VA_HWACCEL 0 #define CONFIG_H264_DXVA2_HWACCEL 0 +#define CONFIG_H264_MMAL_HWACCEL 0 +#define CONFIG_H264_QSV_HWACCEL 0 #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_HEVC_D3D11VA_HWACCEL 0 +#define CONFIG_HEVC_DXVA2_HWACCEL 0 +#define CONFIG_HEVC_QSV_HWACCEL 0 +#define CONFIG_HEVC_VDPAU_HWACCEL 0 #define CONFIG_MPEG1_XVMC_HWACCEL 0 #define CONFIG_MPEG1_VDPAU_HWACCEL 0 #define CONFIG_MPEG2_XVMC_HWACCEL 0 +#define CONFIG_MPEG2_D3D11VA_HWACCEL 0 #define CONFIG_MPEG2_DXVA2_HWACCEL 0 +#define CONFIG_MPEG2_QSV_HWACCEL 0 #define CONFIG_MPEG2_VAAPI_HWACCEL 0 #define CONFIG_MPEG2_VDPAU_HWACCEL 0 #define CONFIG_MPEG4_VAAPI_HWACCEL 0 #define CONFIG_MPEG4_VDPAU_HWACCEL 0 +#define CONFIG_VC1_D3D11VA_HWACCEL 0 #define CONFIG_VC1_DXVA2_HWACCEL 0 #define CONFIG_VC1_VAAPI_HWACCEL 0 #define CONFIG_VC1_VDPAU_HWACCEL 0 +#define CONFIG_VC1_QSV_HWACCEL 0 +#define CONFIG_WMV3_D3D11VA_HWACCEL 0 #define CONFIG_WMV3_DXVA2_HWACCEL 0 #define CONFIG_WMV3_VAAPI_HWACCEL 0 #define CONFIG_WMV3_VDPAU_HWACCEL 0 @@ -1602,6 +1739,7 @@ #define CONFIG_ADX_MUXER 0 #define CONFIG_AIFF_MUXER 0 #define CONFIG_AMR_MUXER 0 +#define CONFIG_APNG_MUXER 0 #define CONFIG_ASF_MUXER 0 #define CONFIG_ASS_MUXER 0 #define CONFIG_AST_MUXER 0 @@ -1673,6 +1811,7 @@ #define CONFIG_MPJPEG_MUXER 0 #define CONFIG_MXF_MUXER 0 #define CONFIG_MXF_D10_MUXER 0 +#define CONFIG_MXF_OPATOM_MUXER 0 #define CONFIG_NULL_MUXER 0 #define CONFIG_NUT_MUXER 0 #define CONFIG_OGA_MUXER 0 @@ -1705,10 +1844,12 @@ #define CONFIG_ROQ_MUXER 0 #define CONFIG_RSO_MUXER 0 #define CONFIG_RTP_MUXER 0 +#define CONFIG_RTP_MPEGTS_MUXER 0 #define CONFIG_RTSP_MUXER 0 #define CONFIG_SAP_MUXER 0 #define CONFIG_SEGMENT_MUXER 0 #define CONFIG_STREAM_SEGMENT_MUXER 0 +#define CONFIG_SINGLEJPEG_MUXER 0 #define CONFIG_SMJPEG_MUXER 0 #define CONFIG_SMOOTHSTREAMING_MUXER 0 #define CONFIG_SOX_MUXER 0 @@ -1729,6 +1870,7 @@ #define CONFIG_WAV_MUXER 0 #define CONFIG_WEBM_MUXER 0 #define CONFIG_WEBM_DASH_MANIFEST_MUXER 0 +#define CONFIG_WEBM_CHUNK_MUXER 0 #define CONFIG_WEBP_MUXER 0 #define CONFIG_WEBVTT_MUXER 0 #define CONFIG_WTV_MUXER 0 @@ -1782,6 +1924,7 @@ #define CONFIG_VP3_PARSER 1 #define CONFIG_VP8_PARSER 1 #define CONFIG_VP9_PARSER 1 +#define CONFIG_ASYNC_PROTOCOL 0 #define CONFIG_BLURAY_PROTOCOL 0 #define CONFIG_CACHE_PROTOCOL 1 #define CONFIG_CONCAT_PROTOCOL 1 @@ -1812,7 +1955,9 @@ #define CONFIG_SRTP_PROTOCOL 0 #define CONFIG_SUBFILE_PROTOCOL 1 #define CONFIG_TCP_PROTOCOL 0 -#define CONFIG_TLS_PROTOCOL 0 +#define CONFIG_TLS_SECURETRANSPORT_PROTOCOL 0 +#define CONFIG_TLS_GNUTLS_PROTOCOL 0 +#define CONFIG_TLS_OPENSSL_PROTOCOL 0 #define CONFIG_UDP_PROTOCOL 0 #define CONFIG_UDPLITE_PROTOCOL 0 #define CONFIG_UNIX_PROTOCOL 0 diff --git a/build/ffmpeg/configure.sh b/build/ffmpeg/configure.sh index 7824407a2..7eed30152 100755 --- a/build/ffmpeg/configure.sh +++ b/build/ffmpeg/configure.sh @@ -9,6 +9,8 @@ fi --disable-avfilter \ --disable-avresample \ --disable-bzlib \ + --disable-d3d11va \ + --disable-dxva2 \ --disable-decoder=atrac3p,indeo2,indeo3,indeo4,indeo5,twinvq \ --disable-devices \ --disable-doc \ diff --git a/build/ffmpeg/ffmpeg.vcxproj b/build/ffmpeg/ffmpeg.vcxproj index d799f10fa..cc6f0f3c2 100644 --- a/build/ffmpeg/ffmpeg.vcxproj +++ b/build/ffmpeg/ffmpeg.vcxproj @@ -33,12 +33,7 @@ _SYSCRT; _USE_MATH_DEFINES; _WIN32_WINNT=0x0502; - _snprintf=avpriv_snprintf; inline=__inline; - snprintf=avpriv_snprintf; - strtod=avpriv_strtod; - strtoll=_strtoi64; - vsnprintf=avpriv_vsnprintf; %(PreprocessorDefinitions) stdlib.h;%(ForcedIncludeFiles) @@ -74,8 +69,6 @@ - - @@ -85,9 +78,13 @@ - - + + + + + + @@ -125,9 +122,6 @@ - - - @@ -156,11 +150,13 @@ + + @@ -178,12 +174,16 @@ + + + + @@ -200,6 +200,7 @@ + @@ -212,21 +213,21 @@ - - + + @@ -238,6 +239,7 @@ + @@ -252,6 +254,7 @@ + @@ -267,6 +270,7 @@ + @@ -287,10 +291,15 @@ + + + + + @@ -299,6 +308,12 @@ + + + + + + @@ -307,26 +322,24 @@ + - - - - - - + + + @@ -352,7 +365,6 @@ - @@ -363,6 +375,7 @@ + @@ -373,6 +386,7 @@ + @@ -388,10 +402,13 @@ + + + @@ -422,7 +439,6 @@ - @@ -433,11 +449,9 @@ - - @@ -458,6 +472,7 @@ + @@ -465,6 +480,7 @@ + @@ -472,6 +488,7 @@ + @@ -486,20 +503,22 @@ - + + + @@ -519,7 +538,9 @@ + + @@ -535,7 +556,6 @@ - @@ -584,6 +604,9 @@ + + + @@ -610,10 +633,12 @@ + + @@ -623,6 +648,7 @@ + @@ -630,6 +656,7 @@ + @@ -651,8 +678,6 @@ - - @@ -670,6 +695,8 @@ + + @@ -689,7 +716,8 @@ - + + @@ -727,10 +755,12 @@ + + @@ -738,6 +768,7 @@ + @@ -803,6 +834,7 @@ + @@ -859,14 +891,11 @@ - - - @@ -919,28 +948,18 @@ - - - - - - - - - - - - + + @@ -980,15 +999,16 @@ + + - @@ -1022,51 +1042,23 @@ $(MSBuildThisFileDirectory) - - - - - + + - - - - - - - + - - - - - - - - - + - - - - - - - - - - - @@ -1076,6 +1068,7 @@ + @@ -1083,24 +1076,27 @@ + + + + - @@ -1123,18 +1119,18 @@ - + + - + - - - - - + + + + @@ -1148,10 +1144,10 @@ - + @@ -1169,10 +1165,12 @@ + + @@ -1199,19 +1197,14 @@ - - - - - + - - + diff --git a/build/ffmpeg/get-file-list.sh b/build/ffmpeg/get-file-list.sh new file mode 100755 index 000000000..d5b5b5213 --- /dev/null +++ b/build/ffmpeg/get-file-list.sh @@ -0,0 +1,13 @@ +rm -f make-dry +make -n > make-dry +grep '^cl' make-dry \ + | sed 's/.*\(lib[^ ]*.c\) .*/\1/' \ + | sed 's/\//\\/g' \ + | sed 's/\(.*\)//' \ + | sort +echo +grep '^yasm' make-dry \ + | sed 's/.*\(lib[^ ]*.asm\) .*/\1/' \ + | sed 's/\//\\/g' \ + | sed 's/\(.*\)//' \ + | sort diff --git a/vendor/boost b/vendor/boost index c038171a3..9ccd3390c 160000 --- a/vendor/boost +++ b/vendor/boost @@ -1 +1 @@ -Subproject commit c038171a340eac748b2d14882f6f79e803d292f4 +Subproject commit 9ccd3390c8e9ef05f4cb681d15b2e14eac48886e diff --git a/vendor/ffmpeg b/vendor/ffmpeg index 794406511..802e51299 160000 --- a/vendor/ffmpeg +++ b/vendor/ffmpeg @@ -1 +1 @@ -Subproject commit 79440651149c89fba9ef5563c9b8a4b3a59acdf5 +Subproject commit 802e51299e6d018f2f54c8d14f2b765c7c750496 diff --git a/vendor/ffms2 b/vendor/ffms2 index 0740a3661..7477df004 160000 --- a/vendor/ffms2 +++ b/vendor/ffms2 @@ -1 +1 @@ -Subproject commit 0740a3661aada5ac5de80781eec88248cce95c62 +Subproject commit 7477df0044bdaa9c869c1c42ef40c5d2b83e6469 diff --git a/vendor/fontconfig b/vendor/fontconfig index 77f3ebc8f..fbc5c4d89 160000 --- a/vendor/fontconfig +++ b/vendor/fontconfig @@ -1 +1 @@ -Subproject commit 77f3ebc8f58a3156995d603513522491dd5e790a +Subproject commit fbc5c4d89553e9d058e6ff06f61c03bfeb596e01