提交 37034cc4 编写于 作者: M Matt Oliver

project: Update for upstream merge.

上级 dcbbbe37
......@@ -1608,6 +1608,7 @@
%define CONFIG_DCA_PARSER 1
%define CONFIG_DIRAC_PARSER 1
%define CONFIG_DNXHD_PARSER 1
%define CONFIG_DOLBY_E_PARSER 1
%define CONFIG_DPX_PARSER 1
%define CONFIG_DVAUDIO_PARSER 1
%define CONFIG_DVBSUB_PARSER 1
......@@ -1843,6 +1844,7 @@
%define CONFIG_COLORLEVELS_FILTER 1
%define CONFIG_COLORMATRIX_FILTER 1
%define CONFIG_COLORSPACE_FILTER 1
%define CONFIG_COLORTEMPERATURE_FILTER 1
%define CONFIG_CONVOLUTION_FILTER 1
%define CONFIG_CONVOLUTION_OPENCL_FILTER 0
%define CONFIG_CONVOLVE_FILTER 1
......@@ -1885,9 +1887,11 @@
%define CONFIG_EDGEDETECT_FILTER 1
%define CONFIG_ELBG_FILTER 1
%define CONFIG_ENTROPY_FILTER 1
%define CONFIG_EPX_FILTER 1
%define CONFIG_EQ_FILTER 1
%define CONFIG_EROSION_FILTER 1
%define CONFIG_EROSION_OPENCL_FILTER 0
%define CONFIG_ESTDIF_FILTER 1
%define CONFIG_EXTRACTPLANES_FILTER 1
%define CONFIG_FADE_FILTER 1
%define CONFIG_FFTDNOIZ_FILTER 1
......@@ -1932,6 +1936,7 @@
%define CONFIG_INTERLACE_FILTER 1
%define CONFIG_INTERLEAVE_FILTER 1
%define CONFIG_KERNDEINT_FILTER 1
%define CONFIG_KIRSCH_FILTER 1
%define CONFIG_LAGFUN_FILTER 1
%define CONFIG_LENSCORRECTION_FILTER 1
%define CONFIG_LENSFUN_FILTER 0
......@@ -2033,6 +2038,7 @@
%define CONFIG_SETSAR_FILTER 1
%define CONFIG_SETTB_FILTER 1
%define CONFIG_SHARPNESS_VAAPI_FILTER 0
%define CONFIG_SHEAR_FILTER 1
%define CONFIG_SHOWINFO_FILTER 1
%define CONFIG_SHOWPALETTE_FILTER 1
%define CONFIG_SHUFFLEFRAMES_FILTER 1
......
......@@ -1730,6 +1730,7 @@
#define CONFIG_DCA_PARSER 1
#define CONFIG_DIRAC_PARSER 1
#define CONFIG_DNXHD_PARSER 1
#define CONFIG_DOLBY_E_PARSER 1
#define CONFIG_DPX_PARSER 1
#define CONFIG_DVAUDIO_PARSER 1
#define CONFIG_DVBSUB_PARSER 1
......@@ -1965,6 +1966,7 @@
#define CONFIG_COLORLEVELS_FILTER 1
#define CONFIG_COLORMATRIX_FILTER 1
#define CONFIG_COLORSPACE_FILTER 1
#define CONFIG_COLORTEMPERATURE_FILTER 1
#define CONFIG_CONVOLUTION_FILTER 1
#define CONFIG_CONVOLUTION_OPENCL_FILTER 0
#define CONFIG_CONVOLVE_FILTER 1
......@@ -2007,9 +2009,11 @@
#define CONFIG_EDGEDETECT_FILTER 1
#define CONFIG_ELBG_FILTER 1
#define CONFIG_ENTROPY_FILTER 1
#define CONFIG_EPX_FILTER 1
#define CONFIG_EQ_FILTER 1
#define CONFIG_EROSION_FILTER 1
#define CONFIG_EROSION_OPENCL_FILTER 0
#define CONFIG_ESTDIF_FILTER 1
#define CONFIG_EXTRACTPLANES_FILTER 1
#define CONFIG_FADE_FILTER 1
#define CONFIG_FFTDNOIZ_FILTER 1
......@@ -2054,6 +2058,7 @@
#define CONFIG_INTERLACE_FILTER 1
#define CONFIG_INTERLEAVE_FILTER 1
#define CONFIG_KERNDEINT_FILTER 1
#define CONFIG_KIRSCH_FILTER 1
#define CONFIG_LAGFUN_FILTER 1
#define CONFIG_LENSCORRECTION_FILTER 1
#define CONFIG_LENSFUN_FILTER 0
......@@ -2155,6 +2160,7 @@
#define CONFIG_SETSAR_FILTER 1
#define CONFIG_SETTB_FILTER 1
#define CONFIG_SHARPNESS_VAAPI_FILTER 0
#define CONFIG_SHEAR_FILTER 1
#define CONFIG_SHOWINFO_FILTER 1
#define CONFIG_SHOWPALETTE_FILTER 1
#define CONFIG_SHUFFLEFRAMES_FILTER 1
......
......@@ -196,8 +196,10 @@
<ClCompile Include="..\libavcodec\atsc_a53.c" />
<ClCompile Include="..\libavcodec\cabac.c" />
<ClCompile Include="..\libavcodec\cbs.c" />
<ClCompile Include="..\libavcodec\cbs_bsf.c" />
<ClCompile Include="..\libavcodec\cbs_av1.c" />
<ClCompile Include="..\libavcodec\cbs_h2645.c" />
<ClCompile Include="..\libavcodec\cbs_sei.c" />
<ClCompile Include="..\libavcodec\h2645_parse.c" />
<ClCompile Include="..\libavcodec\cbs_jpeg.c" />
<ClCompile Include="..\libavcodec\cbs_mpeg2.c" />
......@@ -214,7 +216,6 @@
<ClCompile Include="..\libavcodec\jfdctfst.c" />
<ClCompile Include="..\libavcodec\jfdctint.c" />
<ClCompile Include="..\libavcodec\avfft.c" />
<ClCompile Include="..\libavcodec\fft_fixed.c" />
<ClCompile Include="..\libavcodec\fft_float.c" />
<ClCompile Include="..\libavcodec\fft_fixed_32.c" />
<ClCompile Include="..\libavcodec\fft_init_table.c" />
......@@ -243,7 +244,6 @@
<ClCompile Include="..\libavcodec\lpc.c" />
<ClCompile Include="..\libavcodec\lsp.c" />
<ClCompile Include="..\libavcodec\lzf.c" />
<ClCompile Include="..\libavcodec\mdct_fixed.c" />
<ClCompile Include="..\libavcodec\mdct_float.c" />
<ClCompile Include="..\libavcodec\mdct_fixed_32.c" />
<ClCompile Include="..\libavcodec\mpeg_er.c" />
......@@ -437,6 +437,7 @@
<ClCompile Include="..\libavcodec\dnxhddec.c" />
<ClCompile Include="..\libavcodec\dnxhddata.c" />
<ClCompile Include="..\libavcodec\dolby_e.c" />
<ClCompile Include="..\libavcodec\dolby_e_parse.c" />
<ClCompile Include="..\libavcodec\dpx.c" />
<ClCompile Include="..\libavcodec\dpxenc.c" />
<ClCompile Include="..\libavcodec\dsddec.c" />
......@@ -486,11 +487,12 @@
<ClCompile Include="..\libavcodec\flacdata.c" />
<ClCompile Include="..\libavcodec\flac.c" />
<ClCompile Include="..\libavcodec\flacenc.c" />
<ClCompile Include="..\libavcodec\vorbis_data.c" />
<ClCompile Include="..\libavcodec\flashsv.c" />
<ClCompile Include="..\libavcodec\flashsvenc.c" />
<ClCompile Include="..\libavcodec\flashsv2enc.c" />
<ClCompile Include="..\libavcodec\flicvideo.c" />
<ClCompile Include="..\libavcodec\flvdec.c" />
<ClCompile Include="..\libavcodec\flvenc.c" />
<ClCompile Include="..\libavcodec\fmvc.c" />
<ClCompile Include="..\libavcodec\4xm.c" />
<ClCompile Include="..\libavcodec\fraps.c" />
......@@ -517,12 +519,9 @@
<ClCompile Include="..\libavcodec\ituh263dec.c" />
<ClCompile Include="..\libavcodec\mpeg4video.c" />
<ClCompile Include="..\libavcodec\mpeg4videodec.c" />
<ClCompile Include="..\libavcodec\flvdec.c" />
<ClCompile Include="..\libavcodec\intelh263dec.c" />
<ClCompile Include="..\libavcodec\h263data.c" />
<ClCompile Include="..\libavcodec\mpeg4videoenc.c" />
<ClCompile Include="..\libavcodec\intelh263dec.c" />
<ClCompile Include="..\libavcodec\ituh263enc.c" />
<ClCompile Include="..\libavcodec\flvenc.c" />
<ClCompile Include="..\libavcodec\h264dec.c" />
<ClCompile Include="..\libavcodec\h264_cabac.c" />
<ClCompile Include="..\libavcodec\h264_cavlc.c" />
......@@ -536,7 +535,6 @@
<ClCompile Include="..\libavcodec\h264data.c" />
<ClCompile Include="..\libavcodec\amfenc_h264.c" />
<ClCompile Include="..\libavcodec\nvenc_h264.c" />
<ClCompile Include="..\libavcodec\qsvdec_h2645.c" />
<ClCompile Include="..\libavcodec\qsvenc_h264.c" />
<ClCompile Include="..\libavcodec\hapdec.c" />
<ClCompile Include="..\libavcodec\hap.c" />
......@@ -605,7 +603,6 @@
<ClCompile Include="..\libavcodec\twinvq.c" />
<ClCompile Include="..\libavcodec\microdvddec.c" />
<ClCompile Include="..\libavcodec\mimic.c" />
<ClCompile Include="..\libavcodec\qsvdec_other.c" />
<ClCompile Include="..\libavcodec\mjpegbdec.c" />
<ClCompile Include="..\libavcodec\qsvenc_jpeg.c" />
<ClCompile Include="..\libavcodec\mlpdec.c" />
......@@ -626,6 +623,7 @@
<ClCompile Include="..\libavcodec\mpc8.c" />
<ClCompile Include="..\libavcodec\mpeg12enc.c" />
<ClCompile Include="..\libavcodec\qsvenc_mpeg2.c" />
<ClCompile Include="..\libavcodec\mpeg4videoenc.c" />
<ClCompile Include="..\libavcodec\mpl2dec.c" />
<ClCompile Include="..\libavcodec\mss3.c" />
<ClCompile Include="..\libavcodec\mscc.c" />
......@@ -664,6 +662,7 @@
<ClCompile Include="..\libavcodec\opus_pvq.c" />
<ClCompile Include="..\libavcodec\opus_silk.c" />
<ClCompile Include="..\libavcodec\opustab.c" />
<ClCompile Include="..\libavcodec\vorbis_data.c" />
<ClCompile Include="..\libavcodec\opusenc.c" />
<ClCompile Include="..\libavcodec\opusenc_psy.c" />
<ClCompile Include="..\libavcodec\pafaudio.c" />
......@@ -930,6 +929,7 @@
<ClCompile Include="..\libavcodec\dca_parser.c" />
<ClCompile Include="..\libavcodec\dirac_parser.c" />
<ClCompile Include="..\libavcodec\dnxhd_parser.c" />
<ClCompile Include="..\libavcodec\dolby_e_parser.c" />
<ClCompile Include="..\libavcodec\dpx_parser.c" />
<ClCompile Include="..\libavcodec\dvaudio_parser.c" />
<ClCompile Include="..\libavcodec\dvbsub_parser.c" />
......
......@@ -438,12 +438,18 @@
<ClCompile Include="..\libavcodec\cbs.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\cbs_bsf.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\cbs_av1.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\cbs_h2645.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\cbs_sei.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\h2645_parse.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -492,9 +498,6 @@
<ClCompile Include="..\libavcodec\avfft.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\fft_fixed.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\fft_float.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -579,9 +582,6 @@
<ClCompile Include="..\libavcodec\lzf.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\mdct_fixed.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\mdct_float.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -1161,6 +1161,9 @@
<ClCompile Include="..\libavcodec\dolby_e.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\dolby_e_parse.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\dpx.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -1308,9 +1311,6 @@
<ClCompile Include="..\libavcodec\flacenc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\vorbis_data.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\flashsv.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -1323,6 +1323,12 @@
<ClCompile Include="..\libavcodec\flicvideo.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\flvdec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\flvenc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\fmvc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -1401,24 +1407,15 @@
<ClCompile Include="..\libavcodec\mpeg4videodec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\flvdec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\intelh263dec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\h263data.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\mpeg4videoenc.c">
<ClCompile Include="..\libavcodec\intelh263dec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\ituh263enc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\flvenc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\h264dec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -1458,9 +1455,6 @@
<ClCompile Include="..\libavcodec\nvenc_h264.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\qsvdec_h2645.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\qsvenc_h264.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -1665,9 +1659,6 @@
<ClCompile Include="..\libavcodec\mimic.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\qsvdec_other.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\mjpegbdec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -1728,6 +1719,9 @@
<ClCompile Include="..\libavcodec\qsvenc_mpeg2.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\mpeg4videoenc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\mpl2dec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -1842,6 +1836,9 @@
<ClCompile Include="..\libavcodec\opustab.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\vorbis_data.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\opusenc.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -2640,6 +2637,9 @@
<ClCompile Include="..\libavcodec\dnxhd_parser.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\dolby_e_parser.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\dpx_parser.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......
......@@ -140,7 +140,6 @@ void ff_fdctdsp_init_ppc(FDCTDSPContext *c, AVCodecContext *avctx,
#if !(ARCH_X86_64)
void ff_fft15_avx(FFTComplex *out, FFTComplex *in, FFTComplex *exptab, ptrdiff_t stride) {return;}
#endif
void ff_fft_fixed_init_arm(FFTContext *s) {return;}
void ff_fft_init_aarch64(FFTContext *s) {return;}
void ff_fft_init_arm(FFTContext *s) {return;}
void ff_fft_init_mips(FFTContext *s) {return;}
......
......@@ -32,6 +32,7 @@ static const AVCodecParser *parser_list[] = {
&ff_dca_parser,
&ff_dirac_parser,
&ff_dnxhd_parser,
&ff_dolby_e_parser,
&ff_dpx_parser,
&ff_dvaudio_parser,
&ff_dvbsub_parser,
......
......@@ -246,6 +246,7 @@
<ClCompile Include="..\libavfilter\vf_colormatrix.c" />
<ClCompile Include="..\libavfilter\vf_colorspace.c" />
<ClCompile Include="..\libavfilter\colorspace.c" />
<ClCompile Include="..\libavfilter\vf_colortemperature.c" />
<ClCompile Include="..\libavfilter\vf_convolve.c" />
<ClCompile Include="..\libavfilter\vf_copy.c" />
<ClCompile Include="..\libavfilter\vf_cover_rect.c" />
......@@ -278,6 +279,8 @@
<ClCompile Include="..\libavfilter\vf_edgedetect.c" />
<ClCompile Include="..\libavfilter\vf_elbg.c" />
<ClCompile Include="..\libavfilter\vf_entropy.c" />
<ClCompile Include="..\libavfilter\vf_epx.c" />
<ClCompile Include="..\libavfilter\vf_estdif.c" />
<ClCompile Include="..\libavfilter\vf_fade.c" />
<ClCompile Include="..\libavfilter\vf_fftdnoiz.c" />
<ClCompile Include="..\libavfilter\vf_fftfilt.c" />
......@@ -364,6 +367,7 @@
<ClCompile Include="..\libavfilter\vf_separatefields.c" />
<ClCompile Include="..\libavfilter\vf_aspect.c" />
<ClCompile Include="..\libavfilter\vf_setparams.c" />
<ClCompile Include="..\libavfilter\vf_shear.c" />
<ClCompile Include="..\libavfilter\vf_showinfo.c" />
<ClCompile Include="..\libavfilter\vf_showpalette.c" />
<ClCompile Include="..\libavfilter\vf_shuffleframes.c" />
......
......@@ -591,6 +591,9 @@
<ClCompile Include="..\libavfilter\colorspace.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_colortemperature.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_convolve.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -687,6 +690,12 @@
<ClCompile Include="..\libavfilter\vf_entropy.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_epx.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_estdif.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_fade.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -945,6 +954,9 @@
<ClCompile Include="..\libavfilter\vf_setparams.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_shear.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_showinfo.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......
......@@ -28,13 +28,13 @@
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;}
int thra, int thrb, const float *weights) {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;}
int thra, int thrb, const float *weights) {return;}
#endif
#if !(ARCH_X86_64)
void ff_multiply3x3_sse2(int16_t *data[3], ptrdiff_t stride, int w, int h,
......
......@@ -171,6 +171,7 @@ static const AVFilter *filter_list[] = {
&ff_vf_colorlevels,
&ff_vf_colormatrix,
&ff_vf_colorspace,
&ff_vf_colortemperature,
&ff_vf_convolution,
&ff_vf_convolve,
&ff_vf_copy,
......@@ -207,8 +208,10 @@ static const AVFilter *filter_list[] = {
&ff_vf_edgedetect,
&ff_vf_elbg,
&ff_vf_entropy,
&ff_vf_epx,
&ff_vf_eq,
&ff_vf_erosion,
&ff_vf_estdif,
&ff_vf_extractplanes,
&ff_vf_fade,
&ff_vf_fftdnoiz,
......@@ -252,6 +255,7 @@ static const AVFilter *filter_list[] = {
&ff_vf_interlace,
&ff_vf_interleave,
&ff_vf_kerndeint,
&ff_vf_kirsch,
&ff_vf_lagfun,
&ff_vf_lenscorrection,
&ff_vf_limiter,
......@@ -335,6 +339,7 @@ static const AVFilter *filter_list[] = {
&ff_vf_setrange,
&ff_vf_setsar,
&ff_vf_settb,
&ff_vf_shear,
&ff_vf_showinfo,
&ff_vf_showpalette,
&ff_vf_shuffleframes,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册