提交 ad20af76 编写于 作者: M Matt Oliver

projects: Update for recent merge.

上级 b4e21882
......@@ -1014,6 +1014,7 @@
%define CONFIG_AAC_LATM_DECODER 1
%define CONFIG_AC3_DECODER 1
%define CONFIG_AC3_FIXED_DECODER 1
%define CONFIG_ACELP_KELVIN_DECODER 1
%define CONFIG_ALAC_DECODER 1
%define CONFIG_ALS_DECODER 1
%define CONFIG_AMRNB_DECODER 1
......@@ -1219,7 +1220,6 @@
%define CONFIG_PCM_MULAW_AT_DECODER 0
%define CONFIG_QDMC_AT_DECODER 0
%define CONFIG_QDM2_AT_DECODER 0
%define CONFIG_LIBAOM_AV1_DECODER 0
%define CONFIG_LIBARIBB24_DECODER 0
%define CONFIG_LIBCELT_DECODER 0
%define CONFIG_LIBCODEC2_DECODER 0
......@@ -1242,6 +1242,7 @@
%define CONFIG_BINTEXT_DECODER 1
%define CONFIG_XBIN_DECODER 1
%define CONFIG_IDF_DECODER 1
%define CONFIG_LIBAOM_AV1_DECODER 0
%define CONFIG_LIBOPENH264_DECODER 0
%define CONFIG_H264_CUVID_DECODER 1
%define CONFIG_HEVC_CUVID_DECODER 1
......@@ -1521,6 +1522,7 @@
%define CONFIG_VP9_DXVA2_HWACCEL 1
%define CONFIG_VP9_NVDEC_HWACCEL 1
%define CONFIG_VP9_VAAPI_HWACCEL 0
%define CONFIG_VP9_VDPAU_HWACCEL 0
%define CONFIG_WMV3_D3D11VA_HWACCEL 1
%define CONFIG_WMV3_D3D11VA2_HWACCEL 1
%define CONFIG_WMV3_DXVA2_HWACCEL 1
......@@ -1637,6 +1639,7 @@
%define CONFIG_AMULTIPLY_FILTER 1
%define CONFIG_ANEQUALIZER_FILTER 1
%define CONFIG_ANLMDN_FILTER 1
%define CONFIG_ANLMS_FILTER 1
%define CONFIG_ANULL_FILTER 1
%define CONFIG_APAD_FILTER 1
%define CONFIG_APERMS_FILTER 1
......@@ -1645,6 +1648,7 @@
%define CONFIG_AREALTIME_FILTER 1
%define CONFIG_ARESAMPLE_FILTER 1
%define CONFIG_AREVERSE_FILTER 1
%define CONFIG_ARNNDN_FILTER 1
%define CONFIG_ASELECT_FILTER 1
%define CONFIG_ASENDCMD_FILTER 1
%define CONFIG_ASETNSAMPLES_FILTER 1
......@@ -1731,6 +1735,7 @@
%define CONFIG_AVGBLUR_OPENCL_FILTER 0
%define CONFIG_BBOX_FILTER 1
%define CONFIG_BENCH_FILTER 1
%define CONFIG_BILATERAL_FILTER 1
%define CONFIG_BITPLANENOISE_FILTER 1
%define CONFIG_BLACKDETECT_FILTER 1
%define CONFIG_BLACKFRAME_FILTER 1
......@@ -1852,9 +1857,12 @@
%define CONFIG_LUTRGB_FILTER 1
%define CONFIG_LUTYUV_FILTER 1
%define CONFIG_MASKEDCLAMP_FILTER 1
%define CONFIG_MASKEDMAX_FILTER 1
%define CONFIG_MASKEDMERGE_FILTER 1
%define CONFIG_MASKEDMIN_FILTER 1
%define CONFIG_MASKFUN_FILTER 1
%define CONFIG_MCDEINT_FILTER 1
%define CONFIG_MEDIAN_FILTER 1
%define CONFIG_MERGEPLANES_FILTER 1
%define CONFIG_MESTIMATE_FILTER 1
%define CONFIG_METADATA_FILTER 1
......@@ -1883,6 +1891,7 @@
%define CONFIG_PERMS_FILTER 1
%define CONFIG_PERSPECTIVE_FILTER 1
%define CONFIG_PHASE_FILTER 1
%define CONFIG_PHOTOSENSITIVITY_FILTER 1
%define CONFIG_PIXDESCTEST_FILTER 1
%define CONFIG_PIXSCOPE_FILTER 1
%define CONFIG_PP_FILTER 1
......@@ -1916,6 +1925,7 @@
%define CONFIG_SCALE_QSV_FILTER 1
%define CONFIG_SCALE_VAAPI_FILTER 0
%define CONFIG_SCALE2REF_FILTER 1
%define CONFIG_SCROLL_FILTER 1
%define CONFIG_SELECT_FILTER 1
%define CONFIG_SELECTIVECOLOR_FILTER 1
%define CONFIG_SENDCMD_FILTER 1
......@@ -2007,6 +2017,7 @@
%define CONFIG_PAL75BARS_FILTER 1
%define CONFIG_PAL100BARS_FILTER 1
%define CONFIG_RGBTESTSRC_FILTER 1
%define CONFIG_SIERPINSKI_FILTER 1
%define CONFIG_SMPTEBARS_FILTER 1
%define CONFIG_SMPTEHDBARS_FILTER 1
%define CONFIG_TESTSRC_FILTER 1
......@@ -2474,6 +2485,7 @@
%define CONFIG_SPX_MUXER 1
%define CONFIG_SPDIF_MUXER 1
%define CONFIG_SRT_MUXER 1
%define CONFIG_STREAMHASH_MUXER 1
%define CONFIG_SUP_MUXER 1
%define CONFIG_SWF_MUXER 1
%define CONFIG_TEE_MUXER 1
......
......@@ -1084,6 +1084,7 @@
#define CONFIG_AAC_LATM_DECODER 1
#define CONFIG_AC3_DECODER 1
#define CONFIG_AC3_FIXED_DECODER 1
#define CONFIG_ACELP_KELVIN_DECODER 1
#define CONFIG_ALAC_DECODER 1
#define CONFIG_ALS_DECODER 1
#define CONFIG_AMRNB_DECODER 1
......@@ -1289,7 +1290,6 @@
#define CONFIG_PCM_MULAW_AT_DECODER 0
#define CONFIG_QDMC_AT_DECODER 0
#define CONFIG_QDM2_AT_DECODER 0
#define CONFIG_LIBAOM_AV1_DECODER 0
#define CONFIG_LIBARIBB24_DECODER 0
#define CONFIG_LIBCELT_DECODER 0
#define CONFIG_LIBCODEC2_DECODER 0
......@@ -1312,6 +1312,7 @@
#define CONFIG_BINTEXT_DECODER 1
#define CONFIG_XBIN_DECODER 1
#define CONFIG_IDF_DECODER 1
#define CONFIG_LIBAOM_AV1_DECODER 0
#define CONFIG_LIBOPENH264_DECODER 0
#define CONFIG_H264_CUVID_DECODER 1
#define CONFIG_HEVC_CUVID_DECODER 1
......@@ -1635,6 +1636,7 @@
#endif
#define CONFIG_VP9_NVDEC_HWACCEL 1
#define CONFIG_VP9_VAAPI_HWACCEL 0
#define CONFIG_VP9_VDPAU_HWACCEL 0
#if CONFIG_D3D11VA
# define CONFIG_WMV3_D3D11VA_HWACCEL 1
#else
......@@ -1759,6 +1761,7 @@
#define CONFIG_AMULTIPLY_FILTER 1
#define CONFIG_ANEQUALIZER_FILTER 1
#define CONFIG_ANLMDN_FILTER 1
#define CONFIG_ANLMS_FILTER 1
#define CONFIG_ANULL_FILTER 1
#define CONFIG_APAD_FILTER 1
#define CONFIG_APERMS_FILTER 1
......@@ -1767,6 +1770,7 @@
#define CONFIG_AREALTIME_FILTER 1
#define CONFIG_ARESAMPLE_FILTER 1
#define CONFIG_AREVERSE_FILTER 1
#define CONFIG_ARNNDN_FILTER 1
#define CONFIG_ASELECT_FILTER 1
#define CONFIG_ASENDCMD_FILTER 1
#define CONFIG_ASETNSAMPLES_FILTER 1
......@@ -1853,6 +1857,7 @@
#define CONFIG_AVGBLUR_OPENCL_FILTER 0
#define CONFIG_BBOX_FILTER 1
#define CONFIG_BENCH_FILTER 1
#define CONFIG_BILATERAL_FILTER 1
#define CONFIG_BITPLANENOISE_FILTER 1
#define CONFIG_BLACKDETECT_FILTER 1
#define CONFIG_BLACKFRAME_FILTER 1
......@@ -1974,9 +1979,12 @@
#define CONFIG_LUTRGB_FILTER 1
#define CONFIG_LUTYUV_FILTER 1
#define CONFIG_MASKEDCLAMP_FILTER 1
#define CONFIG_MASKEDMAX_FILTER 1
#define CONFIG_MASKEDMERGE_FILTER 1
#define CONFIG_MASKEDMIN_FILTER 1
#define CONFIG_MASKFUN_FILTER 1
#define CONFIG_MCDEINT_FILTER 1
#define CONFIG_MEDIAN_FILTER 1
#define CONFIG_MERGEPLANES_FILTER 1
#define CONFIG_MESTIMATE_FILTER 1
#define CONFIG_METADATA_FILTER 1
......@@ -2005,6 +2013,7 @@
#define CONFIG_PERMS_FILTER 1
#define CONFIG_PERSPECTIVE_FILTER 1
#define CONFIG_PHASE_FILTER 1
#define CONFIG_PHOTOSENSITIVITY_FILTER 1
#define CONFIG_PIXDESCTEST_FILTER 1
#define CONFIG_PIXSCOPE_FILTER 1
#define CONFIG_PP_FILTER 1
......@@ -2038,6 +2047,7 @@
#define CONFIG_SCALE_QSV_FILTER 1
#define CONFIG_SCALE_VAAPI_FILTER 0
#define CONFIG_SCALE2REF_FILTER 1
#define CONFIG_SCROLL_FILTER 1
#define CONFIG_SELECT_FILTER 1
#define CONFIG_SELECTIVECOLOR_FILTER 1
#define CONFIG_SENDCMD_FILTER 1
......@@ -2129,6 +2139,7 @@
#define CONFIG_PAL75BARS_FILTER 1
#define CONFIG_PAL100BARS_FILTER 1
#define CONFIG_RGBTESTSRC_FILTER 1
#define CONFIG_SIERPINSKI_FILTER 1
#define CONFIG_SMPTEBARS_FILTER 1
#define CONFIG_SMPTEHDBARS_FILTER 1
#define CONFIG_TESTSRC_FILTER 1
......@@ -2596,6 +2607,7 @@
#define CONFIG_SPX_MUXER 1
#define CONFIG_SPDIF_MUXER 1
#define CONFIG_SRT_MUXER 1
#define CONFIG_STREAMHASH_MUXER 1
#define CONFIG_SUP_MUXER 1
#define CONFIG_SWF_MUXER 1
#define CONFIG_TEE_MUXER 1
......
......@@ -216,6 +216,7 @@ EXPORTS
avpriv_h264_has_num_reorder_frames
avpriv_init_elbg
avpriv_mpeg4audio_get_config
avpriv_mpeg4audio_get_config2
avpriv_mpegaudio_decode_header
avpriv_put_string
avpriv_split_xiph_headers
......
......@@ -313,6 +313,13 @@
<ClCompile Include="..\libavcodec\ac3enc_float.c" />
<ClCompile Include="..\libavcodec\ac3enc.c" />
<ClCompile Include="..\libavcodec\ac3enc_fixed.c" />
<ClCompile Include="..\libavcodec\g729dec.c" />
<ClCompile Include="..\libavcodec\celp_math.c" />
<ClCompile Include="..\libavcodec\celp_filters.c" />
<ClCompile Include="..\libavcodec\acelp_filters.c" />
<ClCompile Include="..\libavcodec\acelp_pitch_delay.c" />
<ClCompile Include="..\libavcodec\acelp_vectors.c" />
<ClCompile Include="..\libavcodec\g729postfilter.c" />
<ClCompile Include="..\libavcodec\agm.c" />
<ClCompile Include="..\libavcodec\aic.c" />
<ClCompile Include="..\libavcodec\alac.c" />
......@@ -324,11 +331,6 @@
<ClCompile Include="..\libavcodec\bgmc.c" />
<ClCompile Include="..\libavcodec\mlz.c" />
<ClCompile Include="..\libavcodec\amrnbdec.c" />
<ClCompile Include="..\libavcodec\celp_filters.c" />
<ClCompile Include="..\libavcodec\celp_math.c" />
<ClCompile Include="..\libavcodec\acelp_filters.c" />
<ClCompile Include="..\libavcodec\acelp_vectors.c" />
<ClCompile Include="..\libavcodec\acelp_pitch_delay.c" />
<ClCompile Include="..\libavcodec\amrwbdec.c" />
<ClCompile Include="..\libavcodec\mjpegenc.c" />
<ClCompile Include="..\libavcodec\mjpegenc_common.c" />
......@@ -480,8 +482,6 @@
<ClCompile Include="..\libavcodec\g723_1dec.c" />
<ClCompile Include="..\libavcodec\g723_1.c" />
<ClCompile Include="..\libavcodec\g723_1enc.c" />
<ClCompile Include="..\libavcodec\g729dec.c" />
<ClCompile Include="..\libavcodec\g729postfilter.c" />
<ClCompile Include="..\libavcodec\gdv.c" />
<ClCompile Include="..\libavcodec\gifdec.c" />
<ClCompile Include="..\libavcodec\lzw.c" />
......
......@@ -789,6 +789,27 @@
<ClCompile Include="..\libavcodec\ac3enc_fixed.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\g729dec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\celp_math.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\celp_filters.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\acelp_filters.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\acelp_pitch_delay.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\acelp_vectors.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\g729postfilter.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\agm.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -822,21 +843,6 @@
<ClCompile Include="..\libavcodec\amrnbdec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\celp_filters.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\celp_math.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\acelp_filters.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\acelp_vectors.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\acelp_pitch_delay.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\amrwbdec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -1290,12 +1296,6 @@
<ClCompile Include="..\libavcodec\g723_1enc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\g729dec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\g729postfilter.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\gdv.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......
......@@ -445,6 +445,7 @@ static const AVCodec *codec_list[] = {
&ff_aac_latm_decoder,
&ff_ac3_decoder,
&ff_ac3_fixed_decoder,
&ff_acelp_kelvin_decoder,
&ff_alac_decoder,
&ff_als_decoder,
&ff_amrnb_decoder,
......
......@@ -63,10 +63,12 @@
<NASM Include="..\libavfilter\x86\scene_sad.asm" />
<NASM Include="..\libavfilter\x86\af_afir.asm" />
<NASM Include="..\libavfilter\x86\af_anlmdn.asm" />
<NASM Include="..\libavfilter\x86\vf_atadenoise.asm" />
<NASM Include="..\libavfilter\x86\vf_blend.asm" />
<NASM Include="..\libavfilter\x86\vf_bwdif.asm" />
<NASM Include="..\libavfilter\x86\colorspacedsp.asm" />
<NASM Include="..\libavfilter\x86\vf_convolution.asm" />
<NASM Include="..\libavfilter\x86\vf_eq.asm" />
<NASM Include="..\libavfilter\x86\vf_framerate.asm" />
<NASM Include="..\libavfilter\x86\vf_fspp.asm" />
<NASM Include="..\libavfilter\x86\vf_gblur.asm" />
......@@ -76,6 +78,7 @@
<NASM Include="..\libavfilter\x86\vf_idet.asm" />
<NASM Include="..\libavfilter\x86\vf_interlace.asm" />
<NASM Include="..\libavfilter\x86\vf_limiter.asm" />
<NASM Include="..\libavfilter\x86\vf_maskedclamp.asm" />
<NASM Include="..\libavfilter\x86\vf_maskedmerge.asm" />
<NASM Include="..\libavfilter\x86\vf_overlay.asm" />
<NASM Include="..\libavfilter\x86\vf_pp7.asm" />
......@@ -86,6 +89,7 @@
<NASM Include="..\libavfilter\x86\vf_ssim.asm" />
<NASM Include="..\libavfilter\x86\vf_stereo3d.asm" />
<NASM Include="..\libavfilter\x86\vf_threshold.asm" />
<NASM Include="..\libavfilter\x86\vf_transpose.asm" />
<NASM Include="..\libavfilter\x86\af_volume.asm" />
<NASM Include="..\libavfilter\x86\vf_v360.asm" />
<NASM Include="..\libavfilter\x86\vf_w3fdif.asm" />
......@@ -139,6 +143,7 @@
<ClCompile Include="..\libavfilter\af_amix.c" />
<ClCompile Include="..\libavfilter\af_amultiply.c" />
<ClCompile Include="..\libavfilter\af_anequalizer.c" />
<ClCompile Include="..\libavfilter\af_anlms.c" />
<ClCompile Include="..\libavfilter\af_anull.c" />
<ClCompile Include="..\libavfilter\af_apad.c" />
<ClCompile Include="..\libavfilter\f_perms.c" />
......@@ -148,6 +153,7 @@
<ClCompile Include="..\libavfilter\f_realtime.c" />
<ClCompile Include="..\libavfilter\af_aresample.c" />
<ClCompile Include="..\libavfilter\f_reverse.c" />
<ClCompile Include="..\libavfilter\af_arnndn.c" />
<ClCompile Include="..\libavfilter\f_select.c" />
<ClCompile Include="..\libavfilter\f_sendcmd.c" />
<ClCompile Include="..\libavfilter\af_asetnsamples.c" />
......@@ -208,10 +214,10 @@
<ClCompile Include="..\libavfilter\vf_alphamerge.c" />
<ClCompile Include="..\libavfilter\vf_amplify.c" />
<ClCompile Include="..\libavfilter\vf_subtitles.c" />
<ClCompile Include="..\libavfilter\vf_atadenoise.c" />
<ClCompile Include="..\libavfilter\vf_avgblur.c" />
<ClCompile Include="..\libavfilter\bbox.c" />
<ClCompile Include="..\libavfilter\vf_bbox.c" />
<ClCompile Include="..\libavfilter\vf_bilateral.c" />
<ClCompile Include="..\libavfilter\vf_bitplanenoise.c" />
<ClCompile Include="..\libavfilter\vf_blackdetect.c" />
<ClCompile Include="..\libavfilter\vf_blackframe.c" />
......@@ -260,7 +266,6 @@
<ClCompile Include="..\libavfilter\vf_edgedetect.c" />
<ClCompile Include="..\libavfilter\vf_elbg.c" />
<ClCompile Include="..\libavfilter\vf_entropy.c" />
<ClCompile Include="..\libavfilter\vf_eq.c" />
<ClCompile Include="..\libavfilter\vf_fade.c" />
<ClCompile Include="..\libavfilter\vf_fftdnoiz.c" />
<ClCompile Include="..\libavfilter\vf_fftfilt.c" />
......@@ -298,9 +303,10 @@
<ClCompile Include="..\libavfilter\vf_lumakey.c" />
<ClCompile Include="..\libavfilter\vf_lut.c" />
<ClCompile Include="..\libavfilter\vf_lut2.c" />
<ClCompile Include="..\libavfilter\vf_maskedclamp.c" />
<ClCompile Include="..\libavfilter\vf_maskedminmax.c" />
<ClCompile Include="..\libavfilter\vf_maskfun.c" />
<ClCompile Include="..\libavfilter\vf_mcdeint.c" />
<ClCompile Include="..\libavfilter\vf_median.c" />
<ClCompile Include="..\libavfilter\vf_mergeplanes.c" />
<ClCompile Include="..\libavfilter\vf_mestimate.c" />
<ClCompile Include="..\libavfilter\motion_estimation.c" />
......@@ -320,6 +326,7 @@
<ClCompile Include="..\libavfilter\vf_paletteuse.c" />
<ClCompile Include="..\libavfilter\vf_perspective.c" />
<ClCompile Include="..\libavfilter\vf_phase.c" />
<ClCompile Include="..\libavfilter\vf_photosensitivity.c" />
<ClCompile Include="..\libavfilter\vf_pixdesctest.c" />
<ClCompile Include="..\libavfilter\vf_pp.c" />
<ClCompile Include="..\libavfilter\vf_premultiply.c" />
......@@ -337,6 +344,7 @@
<ClCompile Include="..\libavfilter\vf_scale.c" />
<ClCompile Include="..\libavfilter\scale.c" />
<ClCompile Include="..\libavfilter\vf_scale_qsv.c" />
<ClCompile Include="..\libavfilter\vf_scroll.c" />
<ClCompile Include="..\libavfilter\vf_selectivecolor.c" />
<ClCompile Include="..\libavfilter\vf_separatefields.c" />
<ClCompile Include="..\libavfilter\vf_aspect.c" />
......@@ -358,7 +366,6 @@
<ClCompile Include="..\libavfilter\vf_tile.c" />
<ClCompile Include="..\libavfilter\vf_tonemap.c" />
<ClCompile Include="..\libavfilter\vf_tpad.c" />
<ClCompile Include="..\libavfilter\vf_transpose.c" />
<ClCompile Include="..\libavfilter\vf_unsharp.c" />
<ClCompile Include="..\libavfilter\vf_uspp.c" />
<ClCompile Include="..\libavfilter\vf_vaguedenoiser.c" />
......@@ -378,6 +385,7 @@
<ClCompile Include="..\libavfilter\vsrc_life.c" />
<ClCompile Include="..\libavfilter\vsrc_mandelbrot.c" />
<ClCompile Include="..\libavfilter\vsrc_mptestsrc.c" />
<ClCompile Include="..\libavfilter\vsrc_sierpinski.c" />
<ClCompile Include="..\libavfilter\vsink_nullsink.c" />
<ClCompile Include="..\libavfilter\avf_abitscope.c" />
<ClCompile Include="..\libavfilter\avf_ahistogram.c" />
......@@ -393,14 +401,20 @@
<ClCompile Include="..\libavfilter\src_movie.c" />
<ClCompile Include="..\libavfilter\dnn\dnn_interface.c" />
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native.c" />
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layers.c" />
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_pad.c" />
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_conv2d.c" />
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_depth2space.c" />
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_maximum.c" />
<ClCompile Include="..\libavfilter\x86\scene_sad_init.c" />
<ClCompile Include="..\libavfilter\x86\af_afir_init.c" />
<ClCompile Include="..\libavfilter\x86\af_anlmdn_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_atadenoise_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_blend_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_bwdif_init.c" />
<ClCompile Include="..\libavfilter\x86\colorspacedsp_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_convolution_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_eq_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_fspp_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_gblur_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_gradfun_init.c" />
......@@ -410,6 +424,7 @@
<ClCompile Include="..\libavfilter\x86\vf_idet_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_tinterlace_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_limiter_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_maskedclamp_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_maskedmerge_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_overlay_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_pp7_init.c" />
......@@ -420,6 +435,7 @@
<ClCompile Include="..\libavfilter\x86\vf_ssim_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_stereo3d_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_threshold_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_transpose_init.c" />
<ClCompile Include="..\libavfilter\x86\af_volume_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_v360_init.c" />
<ClCompile Include="..\libavfilter\x86\vf_w3fdif_init.c" />
......@@ -438,6 +454,9 @@
<ClCompile Include="..\libavfilter\af_volume.c">
<ObjectFileName>$(IntDir)\libavfilter_af_volume.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_atadenoise.c">
<ObjectFileName>$(IntDir)\libavfilter_vf_atadenoise.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_blend.c">
<ObjectFileName>$(IntDir)\libavfilter_vf_blend.obj</ObjectFileName>
</ClCompile>
......@@ -450,6 +469,9 @@
<ClCompile Include="..\libavfilter\vf_convolution.c">
<ObjectFileName>$(IntDir)\libavfilter_vf_convolution.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_eq.c">
<ObjectFileName>$(IntDir)\libavfilter_vf_eq.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_framerate.c">
<ObjectFileName>$(IntDir)\libavfilter_vf_framerate.obj</ObjectFileName>
</ClCompile>
......@@ -474,6 +496,9 @@
<ClCompile Include="..\libavfilter\vf_limiter.c">
<ObjectFileName>$(IntDir)\libavfilter_vf_limiter.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_maskedclamp.c">
<ObjectFileName>$(IntDir)\libavfilter_vf_maskedclamp.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_maskedmerge.c">
<ObjectFileName>$(IntDir)\libavfilter_vf_maskedmerge.obj</ObjectFileName>
</ClCompile>
......@@ -501,6 +526,9 @@
<ClCompile Include="..\libavfilter\vf_threshold.c">
<ObjectFileName>$(IntDir)\libavfilter_vf_threshold.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_transpose.c">
<ObjectFileName>$(IntDir)\libavfilter_vf_transpose.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_v360.c">
<ObjectFileName>$(IntDir)\libavfilter_vf_v360.obj</ObjectFileName>
</ClCompile>
......@@ -513,9 +541,6 @@
<ClCompile Include="..\libavfilter\avf_showcqt.c">
<ObjectFileName>$(IntDir)\libavfilter_avf_showcqt.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavfilter\x86\vf_eq.c">
<ObjectFileName>$(IntDir)\libavfilter_x86_vf_eq.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavfilter\x86\vf_noise.c">
<ObjectFileName>$(IntDir)\libavfilter_x86_vf_noise.obj</ObjectFileName>
</ClCompile>
......
......@@ -46,6 +46,9 @@
<NASM Include="..\libavfilter\x86\af_anlmdn.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</NASM>
<NASM Include="..\libavfilter\x86\vf_atadenoise.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</NASM>
<NASM Include="..\libavfilter\x86\vf_blend.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</NASM>
......@@ -58,6 +61,9 @@
<NASM Include="..\libavfilter\x86\vf_convolution.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</NASM>
<NASM Include="..\libavfilter\x86\vf_eq.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</NASM>
<NASM Include="..\libavfilter\x86\vf_framerate.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</NASM>
......@@ -85,6 +91,9 @@
<NASM Include="..\libavfilter\x86\vf_limiter.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</NASM>
<NASM Include="..\libavfilter\x86\vf_maskedclamp.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</NASM>
<NASM Include="..\libavfilter\x86\vf_maskedmerge.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</NASM>
......@@ -115,6 +124,9 @@
<NASM Include="..\libavfilter\x86\vf_threshold.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</NASM>
<NASM Include="..\libavfilter\x86\vf_transpose.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</NASM>
<NASM Include="..\libavfilter\x86\af_volume.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</NASM>
......@@ -270,6 +282,9 @@
<ClCompile Include="..\libavfilter\af_anequalizer.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\af_anlms.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\af_anull.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -297,6 +312,9 @@
<ClCompile Include="..\libavfilter\f_reverse.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\af_arnndn.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\f_select.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -477,9 +495,6 @@
<ClCompile Include="..\libavfilter\vf_subtitles.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_atadenoise.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_avgblur.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -489,6 +504,9 @@
<ClCompile Include="..\libavfilter\vf_bbox.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_bilateral.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_bitplanenoise.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -633,9 +651,6 @@
<ClCompile Include="..\libavfilter\vf_entropy.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_eq.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_fade.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -747,7 +762,7 @@
<ClCompile Include="..\libavfilter\vf_lut2.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_maskedclamp.c">
<ClCompile Include="..\libavfilter\vf_maskedminmax.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_maskfun.c">
......@@ -756,6 +771,9 @@
<ClCompile Include="..\libavfilter\vf_mcdeint.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_median.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_mergeplanes.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -813,6 +831,9 @@
<ClCompile Include="..\libavfilter\vf_phase.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_photosensitivity.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_pixdesctest.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -864,6 +885,9 @@
<ClCompile Include="..\libavfilter\vf_scale_qsv.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_scroll.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_selectivecolor.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -927,9 +951,6 @@
<ClCompile Include="..\libavfilter\vf_tpad.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_transpose.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_unsharp.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -987,6 +1008,9 @@
<ClCompile Include="..\libavfilter\vsrc_mptestsrc.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vsrc_sierpinski.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vsink_nullsink.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -1032,9 +1056,21 @@
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native.c">
<Filter>Source Files\libavfilter\dnn</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layers.c">
<Filter>Source Files\libavfilter\dnn</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_pad.c">
<Filter>Source Files\libavfilter\dnn</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_conv2d.c">
<Filter>Source Files\libavfilter\dnn</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_depth2space.c">
<Filter>Source Files\libavfilter\dnn</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\dnn\dnn_backend_native_layer_maximum.c">
<Filter>Source Files\libavfilter\dnn</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\x86\scene_sad_init.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
......@@ -1044,6 +1080,9 @@
<ClCompile Include="..\libavfilter\x86\af_anlmdn_init.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\x86\vf_atadenoise_init.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\x86\vf_blend_init.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
......@@ -1056,6 +1095,9 @@
<ClCompile Include="..\libavfilter\x86\vf_convolution_init.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\x86\vf_eq_init.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\x86\vf_fspp_init.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
......@@ -1083,6 +1125,9 @@
<ClCompile Include="..\libavfilter\x86\vf_limiter_init.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\x86\vf_maskedclamp_init.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\x86\vf_maskedmerge_init.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
......@@ -1113,6 +1158,9 @@
<ClCompile Include="..\libavfilter\x86\vf_threshold_init.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\x86\vf_transpose_init.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\x86\af_volume_init.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
......@@ -1143,6 +1191,9 @@
<ClCompile Include="..\libavfilter\af_volume.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_atadenoise.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_blend.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -1155,6 +1206,9 @@
<ClCompile Include="..\libavfilter\vf_convolution.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_eq.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_framerate.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -1179,6 +1233,9 @@
<ClCompile Include="..\libavfilter\vf_limiter.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_maskedclamp.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_maskedmerge.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -1206,6 +1263,9 @@
<ClCompile Include="..\libavfilter\vf_threshold.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_transpose.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_v360.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -1218,9 +1278,6 @@
<ClCompile Include="..\libavfilter\avf_showcqt.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\x86\vf_eq.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\x86\vf_noise.c">
<Filter>Source Files\libavfilter\x86</Filter>
</ClCompile>
......
......@@ -24,6 +24,18 @@
#include "libavfilter/vf_nlmeans.h"
#if !(ARCH_X86_64)
void ff_atadenoise_filter_row8_serial_sse4(const uint8_t *src, uint8_t *dst,
const uint8_t **srcf,
int w, int mid, int size,
int thra, int thrb) {return;}
#endif
#if !(ARCH_X86_64)
void ff_atadenoise_filter_row8_sse4(const uint8_t *src, uint8_t *dst,
const uint8_t **srcf,
int w, int mid, int size,
int thra, int thrb) {return;}
#endif
#if !(ARCH_X86_64)
void ff_multiply3x3_sse2(int16_t *data[3], ptrdiff_t stride, int w, int h,
const int16_t coeff[3][3][8]) {return;}
......
......@@ -52,6 +52,7 @@ static const AVFilter *filter_list[] = {
&ff_af_amultiply,
&ff_af_anequalizer,
&ff_af_anlmdn,
&ff_af_anlms,
&ff_af_anull,
&ff_af_apad,
&ff_af_aperms,
......@@ -60,6 +61,7 @@ static const AVFilter *filter_list[] = {
&ff_af_arealtime,
&ff_af_aresample,
&ff_af_areverse,
&ff_af_arnndn,
&ff_af_aselect,
&ff_af_asendcmd,
&ff_af_asetnsamples,
......@@ -136,6 +138,7 @@ static const AVFilter *filter_list[] = {
&ff_vf_avgblur,
&ff_vf_bbox,
&ff_vf_bench,
&ff_vf_bilateral,
&ff_vf_bitplanenoise,
&ff_vf_blackdetect,
&ff_vf_blackframe,
......@@ -245,9 +248,12 @@ static const AVFilter *filter_list[] = {
&ff_vf_lutrgb,
&ff_vf_lutyuv,
&ff_vf_maskedclamp,
&ff_vf_maskedmax,
&ff_vf_maskedmerge,
&ff_vf_maskedmin,
&ff_vf_maskfun,
&ff_vf_mcdeint,
&ff_vf_median,
&ff_vf_mergeplanes,
&ff_vf_mestimate,
&ff_vf_metadata,
......@@ -272,6 +278,7 @@ static const AVFilter *filter_list[] = {
&ff_vf_perms,
&ff_vf_perspective,
&ff_vf_phase,
&ff_vf_photosensitivity,
&ff_vf_pixdesctest,
&ff_vf_pixscope,
&ff_vf_pp,
......@@ -298,6 +305,7 @@ static const AVFilter *filter_list[] = {
&ff_vf_scale,
&ff_vf_scale_qsv,
&ff_vf_scale2ref,
&ff_vf_scroll,
&ff_vf_select,
&ff_vf_selectivecolor,
&ff_vf_sendcmd,
......@@ -373,6 +381,7 @@ static const AVFilter *filter_list[] = {
&ff_vsrc_pal75bars,
&ff_vsrc_pal100bars,
&ff_vsrc_rgbtestsrc,
&ff_vsrc_sierpinski,
&ff_vsrc_smptebars,
&ff_vsrc_smptehdbars,
&ff_vsrc_testsrc,
......
......@@ -136,6 +136,7 @@
<ClCompile Include="..\libavformat\afc.c" />
<ClCompile Include="..\libavformat\aiffdec.c" />
<ClCompile Include="..\libavformat\mov_chan.c" />
<ClCompile Include="..\libavformat\replaygain.c" />
<ClCompile Include="..\libavformat\aiffenc.c" />
<ClCompile Include="..\libavformat\aixdec.c" />
<ClCompile Include="..\libavformat\amr.c" />
......@@ -225,7 +226,6 @@
<ClCompile Include="..\libavformat\flacdec.c" />
<ClCompile Include="..\libavformat\flac_picture.c" />
<ClCompile Include="..\libavformat\oggparsevorbis.c" />
<ClCompile Include="..\libavformat\replaygain.c" />
<ClCompile Include="..\libavformat\vorbiscomment.c" />
<ClCompile Include="..\libavformat\flacenc.c" />
<ClCompile Include="..\libavformat\flacenc_header.c" />
......
......@@ -259,6 +259,9 @@
<ClCompile Include="..\libavformat\mov_chan.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\replaygain.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\aiffenc.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
......@@ -526,9 +529,6 @@
<ClCompile Include="..\libavformat\oggparsevorbis.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\replaygain.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
<ClCompile Include="..\libavformat\vorbiscomment.c">
<Filter>Source Files\libavformat</Filter>
</ClCompile>
......
......@@ -159,6 +159,7 @@ static const AVOutputFormat *muxer_list[] = {
&ff_spx_muxer,
&ff_spdif_muxer,
&ff_srt_muxer,
&ff_streamhash_muxer,
&ff_sup_muxer,
&ff_swf_muxer,
&ff_tee_muxer,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册