Skip to content

F
Ffmpeg

小白菜888 / Ffmpeg

通知 3
Star 0
Fork 0
F
Ffmpeg

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 d6d0b964 编写于 作者: M Matt Oliver
浏览文件
操作

projects: Update for recent upstream merge.

上级 f686fab8
显示空白变更内容
内联 并排
Showing with 65 addition and 31 deletion
SMP/config.asm
浏览文件 @ d6d0b964
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
%define HAVE_CEXP 0 %define HAVE_CEXP 0
%define HAVE_INLINE_ASM 1 %define HAVE_INLINE_ASM 1
%define HAVE_SYMVER 0 %define HAVE_SYMVER 0
%define HAVE_YASM 1 %define HAVE_X86ASM 1
%define HAVE_BIGENDIAN 0 %define HAVE_BIGENDIAN 0
%define HAVE_FAST_UNALIGNED 1 %define HAVE_FAST_UNALIGNED 1
%define HAVE_ALSA_ASOUNDLIB_H 0 %define HAVE_ALSA_ASOUNDLIB_H 0
...@@ -253,6 +253,7 @@ ...@@ -253,6 +253,7 @@
%define HAVE_MACHINE_IOCTL_METEOR_H 0 %define HAVE_MACHINE_IOCTL_METEOR_H 0
%define HAVE_MALLOC_H 1 %define HAVE_MALLOC_H 1
%define HAVE_OPENCV2_CORE_CORE_C_H 0 %define HAVE_OPENCV2_CORE_CORE_C_H 0
%define HAVE_OPENJPEG_2_2_OPENJPEG_H 0
%define HAVE_OPENJPEG_2_1_OPENJPEG_H 0 %define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
%define HAVE_OPENJPEG_2_0_OPENJPEG_H 0 %define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
%define HAVE_OPENJPEG_1_5_OPENJPEG_H 0 %define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
...@@ -700,6 +701,7 @@ ...@@ -700,6 +701,7 @@
%define CONFIG_NULL_BSF 1 %define CONFIG_NULL_BSF 1
%define CONFIG_REMOVE_EXTRADATA_BSF 1 %define CONFIG_REMOVE_EXTRADATA_BSF 1
%define CONFIG_TEXT2MOVSUB_BSF 1 %define CONFIG_TEXT2MOVSUB_BSF 1
%define CONFIG_VP9_RAW_REORDER_BSF 1
%define CONFIG_VP9_SUPERFRAME_BSF 1 %define CONFIG_VP9_SUPERFRAME_BSF 1
%define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 1 %define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 1
%define CONFIG_AASC_DECODER 1 %define CONFIG_AASC_DECODER 1
...@@ -1659,6 +1661,7 @@ ...@@ -1659,6 +1661,7 @@
%define CONFIG_MPEG2_QSV_ENCODER 1 %define CONFIG_MPEG2_QSV_ENCODER 1
%define CONFIG_MPEG2_VAAPI_ENCODER 0 %define CONFIG_MPEG2_VAAPI_ENCODER 0
%define CONFIG_VP8_VAAPI_ENCODER 0 %define CONFIG_VP8_VAAPI_ENCODER 0
%define CONFIG_VP9_VAAPI_ENCODER 0
%define CONFIG_ABENCH_FILTER 1 %define CONFIG_ABENCH_FILTER 1
%define CONFIG_ACOMPRESSOR_FILTER 1 %define CONFIG_ACOMPRESSOR_FILTER 1
%define CONFIG_ACOPY_FILTER 1 %define CONFIG_ACOPY_FILTER 1
...@@ -1741,6 +1744,7 @@ ...@@ -1741,6 +1744,7 @@
%define CONFIG_SOFALIZER_FILTER 0 %define CONFIG_SOFALIZER_FILTER 0
%define CONFIG_STEREOTOOLS_FILTER 1 %define CONFIG_STEREOTOOLS_FILTER 1
%define CONFIG_STEREOWIDEN_FILTER 1 %define CONFIG_STEREOWIDEN_FILTER 1
%define CONFIG_SUPEREQUALIZER_FILTER 1
%define CONFIG_SURROUND_FILTER 1 %define CONFIG_SURROUND_FILTER 1
%define CONFIG_TREBLE_FILTER 1 %define CONFIG_TREBLE_FILTER 1
%define CONFIG_TREMOLO_FILTER 1 %define CONFIG_TREMOLO_FILTER 1
...@@ -1894,6 +1898,7 @@ ...@@ -1894,6 +1898,7 @@
%define CONFIG_REMOVELOGO_FILTER 1 %define CONFIG_REMOVELOGO_FILTER 1
%define CONFIG_REPEATFIELDS_FILTER 1 %define CONFIG_REPEATFIELDS_FILTER 1
%define CONFIG_REVERSE_FILTER 1 %define CONFIG_REVERSE_FILTER 1
%define CONFIG_ROBERTS_FILTER 1
%define CONFIG_ROTATE_FILTER 1 %define CONFIG_ROTATE_FILTER 1
%define CONFIG_SAB_FILTER 1 %define CONFIG_SAB_FILTER 1
%define CONFIG_SCALE_FILTER 1 %define CONFIG_SCALE_FILTER 1
......
SMP/config.h
浏览文件 @ d6d0b964
...@@ -184,24 +184,24 @@ ...@@ -184,24 +184,24 @@
#define HAVE_POWER8_INLINE 0 #define HAVE_POWER8_INLINE 0
#define HAVE_PPC4XX_INLINE 0 #define HAVE_PPC4XX_INLINE 0
#define HAVE_VSX_INLINE 0 #define HAVE_VSX_INLINE 0
#define HAVE_AESNI_INLINE HAVE_INLINE_ASM #define HAVE_AESNI_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_AMD3DNOW_INLINE HAVE_INLINE_ASM #define HAVE_AMD3DNOW_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_AMD3DNOWEXT_INLINE HAVE_INLINE_ASM #define HAVE_AMD3DNOWEXT_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_AVX_INLINE HAVE_INLINE_ASM #define HAVE_AVX_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_AVX2_INLINE HAVE_INLINE_ASM #define HAVE_AVX2_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_FMA3_INLINE HAVE_INLINE_ASM #define HAVE_FMA3_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_FMA4_INLINE HAVE_INLINE_ASM #define HAVE_FMA4_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_MMX_INLINE HAVE_INLINE_ASM #define HAVE_MMX_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_MMXEXT_INLINE HAVE_INLINE_ASM #define HAVE_MMXEXT_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_SSE_INLINE HAVE_INLINE_ASM #define HAVE_SSE_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_SSE2_INLINE HAVE_INLINE_ASM #define HAVE_SSE2_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_SSE3_INLINE HAVE_INLINE_ASM #define HAVE_SSE3_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_SSE4_INLINE HAVE_INLINE_ASM #define HAVE_SSE4_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_SSE42_INLINE HAVE_INLINE_ASM #define HAVE_SSE42_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_SSSE3_INLINE HAVE_INLINE_ASM #define HAVE_SSSE3_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_XOP_INLINE HAVE_INLINE_ASM #define HAVE_XOP_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_CPUNOP_INLINE HAVE_INLINE_ASM #define HAVE_CPUNOP_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_I686_INLINE HAVE_INLINE_ASM #define HAVE_I686_INLINE ARCH_X86 && HAVE_INLINE_ASM
#define HAVE_MIPSFPU_INLINE 0 #define HAVE_MIPSFPU_INLINE 0
#define HAVE_MIPS32R2_INLINE 0 #define HAVE_MIPS32R2_INLINE 0
#define HAVE_MIPS32R5_INLINE 0 #define HAVE_MIPS32R5_INLINE 0
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
# define HAVE_INLINE_ASM 0 # define HAVE_INLINE_ASM 0
#endif #endif
#define HAVE_SYMVER 0 #define HAVE_SYMVER 0
#define HAVE_YASM 1 #define HAVE_X86ASM 1
#define HAVE_BIGENDIAN 0 #define HAVE_BIGENDIAN 0
#define HAVE_FAST_UNALIGNED 1 #define HAVE_FAST_UNALIGNED 1
#define HAVE_ALSA_ASOUNDLIB_H 0 #define HAVE_ALSA_ASOUNDLIB_H 0
...@@ -283,6 +283,7 @@ ...@@ -283,6 +283,7 @@
#define HAVE_MACHINE_IOCTL_METEOR_H 0 #define HAVE_MACHINE_IOCTL_METEOR_H 0
#define HAVE_MALLOC_H 1 #define HAVE_MALLOC_H 1
#define HAVE_OPENCV2_CORE_CORE_C_H 0 #define HAVE_OPENCV2_CORE_CORE_C_H 0
#define HAVE_OPENJPEG_2_2_OPENJPEG_H 0
#define HAVE_OPENJPEG_2_1_OPENJPEG_H 0 #define HAVE_OPENJPEG_2_1_OPENJPEG_H 0
#define HAVE_OPENJPEG_2_0_OPENJPEG_H 0 #define HAVE_OPENJPEG_2_0_OPENJPEG_H 0
#define HAVE_OPENJPEG_1_5_OPENJPEG_H 0 #define HAVE_OPENJPEG_1_5_OPENJPEG_H 0
...@@ -757,6 +758,7 @@ ...@@ -757,6 +758,7 @@
#define CONFIG_NULL_BSF 1 #define CONFIG_NULL_BSF 1
#define CONFIG_REMOVE_EXTRADATA_BSF 1 #define CONFIG_REMOVE_EXTRADATA_BSF 1
#define CONFIG_TEXT2MOVSUB_BSF 1 #define CONFIG_TEXT2MOVSUB_BSF 1
#define CONFIG_VP9_RAW_REORDER_BSF 1
#define CONFIG_VP9_SUPERFRAME_BSF 1 #define CONFIG_VP9_SUPERFRAME_BSF 1
#define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 1 #define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 1
#define CONFIG_AASC_DECODER 1 #define CONFIG_AASC_DECODER 1
...@@ -1716,6 +1718,7 @@ ...@@ -1716,6 +1718,7 @@
#define CONFIG_MPEG2_QSV_ENCODER 1 #define CONFIG_MPEG2_QSV_ENCODER 1
#define CONFIG_MPEG2_VAAPI_ENCODER 0 #define CONFIG_MPEG2_VAAPI_ENCODER 0
#define CONFIG_VP8_VAAPI_ENCODER 0 #define CONFIG_VP8_VAAPI_ENCODER 0
#define CONFIG_VP9_VAAPI_ENCODER 0
#define CONFIG_ABENCH_FILTER 1 #define CONFIG_ABENCH_FILTER 1
#define CONFIG_ACOMPRESSOR_FILTER 1 #define CONFIG_ACOMPRESSOR_FILTER 1
#define CONFIG_ACOPY_FILTER 1 #define CONFIG_ACOPY_FILTER 1
...@@ -1798,6 +1801,7 @@ ...@@ -1798,6 +1801,7 @@
#define CONFIG_SOFALIZER_FILTER 0 #define CONFIG_SOFALIZER_FILTER 0
#define CONFIG_STEREOTOOLS_FILTER 1 #define CONFIG_STEREOTOOLS_FILTER 1
#define CONFIG_STEREOWIDEN_FILTER 1 #define CONFIG_STEREOWIDEN_FILTER 1
#define CONFIG_SUPEREQUALIZER_FILTER 1
#define CONFIG_SURROUND_FILTER 1 #define CONFIG_SURROUND_FILTER 1
#define CONFIG_TREBLE_FILTER 1 #define CONFIG_TREBLE_FILTER 1
#define CONFIG_TREMOLO_FILTER 1 #define CONFIG_TREMOLO_FILTER 1
...@@ -1951,6 +1955,7 @@ ...@@ -1951,6 +1955,7 @@
#define CONFIG_REMOVELOGO_FILTER 1 #define CONFIG_REMOVELOGO_FILTER 1
#define CONFIG_REPEATFIELDS_FILTER 1 #define CONFIG_REPEATFIELDS_FILTER 1
#define CONFIG_REVERSE_FILTER 1 #define CONFIG_REVERSE_FILTER 1
#define CONFIG_ROBERTS_FILTER 1
#define CONFIG_ROTATE_FILTER 1 #define CONFIG_ROTATE_FILTER 1
#define CONFIG_SAB_FILTER 1 #define CONFIG_SAB_FILTER 1
#define CONFIG_SCALE_FILTER 1 #define CONFIG_SCALE_FILTER 1
......
SMP/libavcodec.vcxproj
浏览文件 @ d6d0b964
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
<YASM Include="..\libavcodec\x86\lossless_audiodsp.asm" /> <YASM Include="..\libavcodec\x86\lossless_audiodsp.asm" />
<YASM Include="..\libavcodec\x86\lossless_videodsp.asm" /> <YASM Include="..\libavcodec\x86\lossless_videodsp.asm" />
<YASM Include="..\libavcodec\x86\lossless_videoencdsp.asm" /> <YASM Include="..\libavcodec\x86\lossless_videoencdsp.asm" />
<YASM Include="..\libavcodec\x86\mdct15.asm" />
<YASM Include="..\libavcodec\x86\me_cmp.asm" /> <YASM Include="..\libavcodec\x86\me_cmp.asm" />
<YASM Include="..\libavcodec\x86\imdct36.asm" /> <YASM Include="..\libavcodec\x86\imdct36.asm" />
<YASM Include="..\libavcodec\x86\mpegvideoencdsp.asm" /> <YASM Include="..\libavcodec\x86\mpegvideoencdsp.asm" />
...@@ -223,7 +224,6 @@ ...@@ -223,7 +224,6 @@
<ClCompile Include="..\libavcodec\huffman.c" /> <ClCompile Include="..\libavcodec\huffman.c" />
<ClCompile Include="..\libavcodec\jrevdct.c" /> <ClCompile Include="..\libavcodec\jrevdct.c" />
<ClCompile Include="..\libavcodec\iirfilter.c" /> <ClCompile Include="..\libavcodec\iirfilter.c" />
<ClCompile Include="..\libavcodec\mdct15.c" />
<ClCompile Include="..\libavcodec\intrax8.c" /> <ClCompile Include="..\libavcodec\intrax8.c" />
<ClCompile Include="..\libavcodec\intrax8dsp.c" /> <ClCompile Include="..\libavcodec\intrax8dsp.c" />
<ClCompile Include="..\libavcodec\ivi_dsp.c" /> <ClCompile Include="..\libavcodec\ivi_dsp.c" />
...@@ -903,6 +903,7 @@ ...@@ -903,6 +903,7 @@
<ClCompile Include="..\libavcodec\noise_bsf.c" /> <ClCompile Include="..\libavcodec\noise_bsf.c" />
<ClCompile Include="..\libavcodec\null_bsf.c" /> <ClCompile Include="..\libavcodec\null_bsf.c" />
<ClCompile Include="..\libavcodec\remove_extradata_bsf.c" /> <ClCompile Include="..\libavcodec\remove_extradata_bsf.c" />
<ClCompile Include="..\libavcodec\vp9_raw_reorder_bsf.c" />
<ClCompile Include="..\libavcodec\vp9_superframe_bsf.c" /> <ClCompile Include="..\libavcodec\vp9_superframe_bsf.c" />
<ClCompile Include="..\libavcodec\vp9_superframe_split_bsf.c" /> <ClCompile Include="..\libavcodec\vp9_superframe_split_bsf.c" />
<ClCompile Include="..\libavcodec\file_open.c" /> <ClCompile Include="..\libavcodec\file_open.c" />
...@@ -934,6 +935,7 @@ ...@@ -934,6 +935,7 @@
<ClCompile Include="..\libavcodec\x86\huffyuvdsp_init.c" /> <ClCompile Include="..\libavcodec\x86\huffyuvdsp_init.c" />
<ClCompile Include="..\libavcodec\x86\huffyuvencdsp_init.c" /> <ClCompile Include="..\libavcodec\x86\huffyuvencdsp_init.c" />
<ClCompile Include="..\libavcodec\x86\idctdsp_init.c" /> <ClCompile Include="..\libavcodec\x86\idctdsp_init.c" />
<ClCompile Include="..\libavcodec\x86\mdct15_init.c" />
<ClCompile Include="..\libavcodec\x86\me_cmp_init.c" /> <ClCompile Include="..\libavcodec\x86\me_cmp_init.c" />
<ClCompile Include="..\libavcodec\x86\mpegvideoenc.c" /> <ClCompile Include="..\libavcodec\x86\mpegvideoenc.c" />
<ClCompile Include="..\libavcodec\x86\mpegvideoencdsp_init.c" /> <ClCompile Include="..\libavcodec\x86\mpegvideoencdsp_init.c" />
...@@ -1012,6 +1014,9 @@ ...@@ -1012,6 +1014,9 @@
<ClCompile Include="..\libavcodec\simple_idct.c"> <ClCompile Include="..\libavcodec\simple_idct.c">
<ObjectFileName>$(IntDir)\libavcodec_simple_idct.obj</ObjectFileName> <ObjectFileName>$(IntDir)\libavcodec_simple_idct.obj</ObjectFileName>
</ClCompile> </ClCompile>
<ClCompile Include="..\libavcodec\mdct15.c">
<ObjectFileName>$(IntDir)\libavcodec_mdct15.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\lossless_audiodsp.c"> <ClCompile Include="..\libavcodec\lossless_audiodsp.c">
<ObjectFileName>$(IntDir)\libavcodec_lossless_audiodsp.obj</ObjectFileName> <ObjectFileName>$(IntDir)\libavcodec_lossless_audiodsp.obj</ObjectFileName>
</ClCompile> </ClCompile>
......
SMP/libavcodec.vcxproj.filters
浏览文件 @ d6d0b964
...@@ -124,6 +124,9 @@ ...@@ -124,6 +124,9 @@
<YASM Include="..\libavcodec\x86\lossless_videoencdsp.asm"> <YASM Include="..\libavcodec\x86\lossless_videoencdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter> <Filter>Source Files\libavcodec\x86</Filter>
</YASM> </YASM>
<YASM Include="..\libavcodec\x86\mdct15.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\me_cmp.asm"> <YASM Include="..\libavcodec\x86\me_cmp.asm">
<Filter>Source Files\libavcodec\x86</Filter> <Filter>Source Files\libavcodec\x86</Filter>
</YASM> </YASM>
...@@ -492,9 +495,6 @@ ...@@ -492,9 +495,6 @@
<ClCompile Include="..\libavcodec\iirfilter.c"> <ClCompile Include="..\libavcodec\iirfilter.c">
<Filter>Source Files\libavcodec</Filter> <Filter>Source Files\libavcodec</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\libavcodec\mdct15.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\intrax8.c"> <ClCompile Include="..\libavcodec\intrax8.c">
<Filter>Source Files\libavcodec</Filter> <Filter>Source Files\libavcodec</Filter>
</ClCompile> </ClCompile>
...@@ -2532,6 +2532,9 @@ ...@@ -2532,6 +2532,9 @@
<ClCompile Include="..\libavcodec\remove_extradata_bsf.c"> <ClCompile Include="..\libavcodec\remove_extradata_bsf.c">
<Filter>Source Files\libavcodec</Filter> <Filter>Source Files\libavcodec</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\libavcodec\vp9_raw_reorder_bsf.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\vp9_superframe_bsf.c"> <ClCompile Include="..\libavcodec\vp9_superframe_bsf.c">
<Filter>Source Files\libavcodec</Filter> <Filter>Source Files\libavcodec</Filter>
</ClCompile> </ClCompile>
...@@ -2625,6 +2628,9 @@ ...@@ -2625,6 +2628,9 @@
<ClCompile Include="..\libavcodec\x86\idctdsp_init.c"> <ClCompile Include="..\libavcodec\x86\idctdsp_init.c">
<Filter>Source Files\libavcodec\x86</Filter> <Filter>Source Files\libavcodec\x86</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\libavcodec\x86\mdct15_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\me_cmp_init.c"> <ClCompile Include="..\libavcodec\x86\me_cmp_init.c">
<Filter>Source Files\libavcodec\x86</Filter> <Filter>Source Files\libavcodec\x86</Filter>
</ClCompile> </ClCompile>
...@@ -2793,6 +2799,9 @@ ...@@ -2793,6 +2799,9 @@
<ClCompile Include="..\libavcodec\simple_idct.c"> <ClCompile Include="..\libavcodec\simple_idct.c">
<Filter>Source Files\libavcodec</Filter> <Filter>Source Files\libavcodec</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\libavcodec\mdct15.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\lossless_audiodsp.c"> <ClCompile Include="..\libavcodec\lossless_audiodsp.c">
<Filter>Source Files\libavcodec</Filter> <Filter>Source Files\libavcodec</Filter>
</ClCompile> </ClCompile>
......
SMP/libavcodec/bsf_list.c
浏览文件 @ d6d0b964
...@@ -36,6 +36,7 @@ static const AVBitStreamFilter *bitstream_filters[] = { ...@@ -36,6 +36,7 @@ static const AVBitStreamFilter *bitstream_filters[] = {
&ff_null_bsf, &ff_null_bsf,
&ff_remove_extradata_bsf, &ff_remove_extradata_bsf,
&ff_text2movsub_bsf, &ff_text2movsub_bsf,
&ff_vp9_raw_reorder_bsf,
&ff_vp9_superframe_bsf, &ff_vp9_superframe_bsf,
&ff_vp9_superframe_split_bsf, &ff_vp9_superframe_split_bsf,
NULL }; NULL };
\ No newline at end of file
SMP/libavcodec/dce_defs.c
浏览文件 @ d6d0b964
...@@ -147,6 +147,9 @@ void ff_fdct_sse2(int16_t *block) {return;} ...@@ -147,6 +147,9 @@ void ff_fdct_sse2(int16_t *block) {return;}
#endif #endif
void ff_fdctdsp_init_ppc(FDCTDSPContext *c, AVCodecContext *avctx, void ff_fdctdsp_init_ppc(FDCTDSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth) {return;} unsigned high_bit_depth) {return;}
#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_fixed_init_arm(FFTContext *s) {return;}
void ff_fft_init_aarch64(FFTContext *s) {return;} void ff_fft_init_aarch64(FFTContext *s) {return;}
void ff_fft_init_arm(FFTContext *s) {return;} void ff_fft_init_arm(FFTContext *s) {return;}
...@@ -3495,9 +3498,6 @@ void ff_mpv_common_init_mips(MpegEncContext *s) {return;} ...@@ -3495,9 +3498,6 @@ void ff_mpv_common_init_mips(MpegEncContext *s) {return;}
void ff_mpv_common_init_neon(MpegEncContext *s) {return;} void ff_mpv_common_init_neon(MpegEncContext *s) {return;}
void ff_mpv_common_init_ppc(MpegEncContext *s) {return;} void ff_mpv_common_init_ppc(MpegEncContext *s) {return;}
#if !(CONFIG_MSMPEG4_ENCODER) #if !(CONFIG_MSMPEG4_ENCODER)
void ff_msmpeg4_encode_ext_header(MpegEncContext *s) {return;}
#endif
#if !(CONFIG_MSMPEG4_ENCODER)
void ff_msmpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], void ff_msmpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64],
int motion_x, int motion_y) {return;} int motion_x, int motion_y) {return;}
#endif #endif
...@@ -3686,6 +3686,7 @@ AVCodec ff_vc1_vdpau_decoder = {0}; ...@@ -3686,6 +3686,7 @@ AVCodec ff_vc1_vdpau_decoder = {0};
AVCodec ff_vp8_mediacodec_decoder = {0}; AVCodec ff_vp8_mediacodec_decoder = {0};
AVCodec ff_vp8_vaapi_encoder = {0}; AVCodec ff_vp8_vaapi_encoder = {0};
AVCodec ff_vp9_mediacodec_decoder = {0}; AVCodec ff_vp9_mediacodec_decoder = {0};
AVCodec ff_vp9_vaapi_encoder = {0};
AVCodec ff_wmv3_crystalhd_decoder = {0}; AVCodec ff_wmv3_crystalhd_decoder = {0};
AVCodec ff_wmv3_vdpau_decoder = {0}; AVCodec ff_wmv3_vdpau_decoder = {0};
AVHWAccel ff_h263_vaapi_hwaccel = {0}; AVHWAccel ff_h263_vaapi_hwaccel = {0};
......
SMP/libavfilter.vcxproj
浏览文件 @ d6d0b964
...@@ -178,6 +178,7 @@ ...@@ -178,6 +178,7 @@
<ClCompile Include="..\libavfilter\af_silenceremove.c" /> <ClCompile Include="..\libavfilter\af_silenceremove.c" />
<ClCompile Include="..\libavfilter\af_stereotools.c" /> <ClCompile Include="..\libavfilter\af_stereotools.c" />
<ClCompile Include="..\libavfilter\af_stereowiden.c" /> <ClCompile Include="..\libavfilter\af_stereowiden.c" />
<ClCompile Include="..\libavfilter\af_superequalizer.c" />
<ClCompile Include="..\libavfilter\af_surround.c" /> <ClCompile Include="..\libavfilter\af_surround.c" />
<ClCompile Include="..\libavfilter\af_tremolo.c" /> <ClCompile Include="..\libavfilter\af_tremolo.c" />
<ClCompile Include="..\libavfilter\af_vibrato.c" /> <ClCompile Include="..\libavfilter\af_vibrato.c" />
......
SMP/libavfilter.vcxproj.filters
浏览文件 @ d6d0b964
...@@ -357,6 +357,9 @@ ...@@ -357,6 +357,9 @@
<ClCompile Include="..\libavfilter\af_stereowiden.c"> <ClCompile Include="..\libavfilter\af_stereowiden.c">
<Filter>Source Files\libavfilter</Filter> <Filter>Source Files\libavfilter</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\libavfilter\af_superequalizer.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\af_surround.c"> <ClCompile Include="..\libavfilter\af_surround.c">
<Filter>Source Files\libavfilter</Filter> <Filter>Source Files\libavfilter</Filter>
</ClCompile> </ClCompile>
......
SMP/project_get_dependencies.bat
浏览文件 @ d6d0b964
...@@ -42,7 +42,7 @@ IF "%MSVC_VER%"=="" ( ...@@ -42,7 +42,7 @@ IF "%MSVC_VER%"=="" (
git status >NUL 2>&1 git status >NUL 2>&1
IF %ERRORLEVEL% NEQ 0 ( IF %ERRORLEVEL% NEQ 0 (
ECHO A working copy of git was not found. To use this script you must first install git for windows. ECHO A working copy of git was not found. To use this script you must first install git for windows.
EXIT /B 1 GOTO exitOnError
) )
) )
...@@ -58,9 +58,9 @@ FOR %%I IN %DEPENDENCIES% DO ( ...@@ -58,9 +58,9 @@ FOR %%I IN %DEPENDENCIES% DO (
ECHO !PASSDEPENDENCIES! | FINDSTR /C:"%%I" >NUL 2>&1 || ( ECHO !PASSDEPENDENCIES! | FINDSTR /C:"%%I" >NUL 2>&1 || (
REM Check if MSVC_VER environment variable is set REM Check if MSVC_VER environment variable is set
IF "%MSVC_VER%"=="" ( IF "%MSVC_VER%"=="" (
CALL :cloneOrUpdateRepo "%%I" || GOTO exit CALL :cloneOrUpdateRepo "%%I" || GOTO exitOnError
) ELSE ( ) ELSE (
CALL :downloadLibs "%%I" || GOTO exit CALL :downloadLibs "%%I" || GOTO exitOnError
) )
) )
) )
...@@ -95,6 +95,10 @@ IF EXIST "%REPONAME%" ( ...@@ -95,6 +95,10 @@ IF EXIST "%REPONAME%" (
REM Clone from the origin repo REM Clone from the origin repo
SET REPOURL=%UPSTREAMURL%/%REPONAME%.git SET REPOURL=%UPSTREAMURL%/%REPONAME%.git
git clone !REPOURL! --quiet git clone !REPOURL! --quiet
IF %ERRORLEVEL% NEQ 0 (
ECHO %REPONAME%: Git clone failed.
GOTO exitOnError
)
REM Initialise autocrlf options to fix cross platform interoperation REM Initialise autocrlf options to fix cross platform interoperation
REM Once updated the repo needs to be reset to correct the local line endings REM Once updated the repo needs to be reset to correct the local line endings
cd %REPONAME% cd %REPONAME%
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或