提交 38e05144 编写于 作者: M Matt Oliver

Projects: Update for recent upstream merge.

上级 1efc66ea
......@@ -346,6 +346,7 @@
%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
......@@ -373,6 +374,7 @@
%define CONFIG_FILTERING_VIDEO_EXAMPLE 0
%define CONFIG_METADATA_EXAMPLE 0
%define CONFIG_MUXING_EXAMPLE 0
%define CONFIG_QSVDEC_EXAMPLE 0
%define CONFIG_REMUXING_EXAMPLE 0
%define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
%define CONFIG_SCALING_VIDEO_EXAMPLE 0
......@@ -520,6 +522,7 @@
%define CONFIG_FAANDCT 1
%define CONFIG_FAANIDCT 1
%define CONFIG_FDCTDSP 1
%define CONFIG_FMTCONVERT 1
%define CONFIG_FRAME_THREAD_ENCODER 1
%define CONFIG_GCRYPT 0
%define CONFIG_GOLOMB 1
......
......@@ -385,6 +385,7 @@
#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
......@@ -412,6 +413,7 @@
#define CONFIG_FILTERING_VIDEO_EXAMPLE 0
#define CONFIG_METADATA_EXAMPLE 0
#define CONFIG_MUXING_EXAMPLE 0
#define CONFIG_QSVDEC_EXAMPLE 0
#define CONFIG_REMUXING_EXAMPLE 0
#define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
#define CONFIG_SCALING_VIDEO_EXAMPLE 0
......@@ -567,6 +569,7 @@
#define CONFIG_FAANDCT 1
#define CONFIG_FAANIDCT 1
#define CONFIG_FDCTDSP 1
#define CONFIG_FMTCONVERT 1
#define CONFIG_FRAME_THREAD_ENCODER 1
#define CONFIG_GCRYPT 0
#define CONFIG_GOLOMB 1
......
......@@ -60,7 +60,6 @@
</ItemGroup>
<ItemGroup>
<YASM Include="..\libavcodec\x86\deinterlace.asm" />
<YASM Include="..\libavcodec\x86\fmtconvert.asm" />
<YASM Include="..\libavcodec\x86\ac3dsp.asm" />
<YASM Include="..\libavcodec\x86\audiodsp.asm" />
<YASM Include="..\libavcodec\x86\blockdsp.asm" />
......@@ -72,6 +71,7 @@
<YASM Include="..\libavcodec\x86\fft.asm" />
<YASM Include="..\libavcodec\x86\flacdsp.asm" />
<YASM Include="..\libavcodec\x86\flac_dsp_gpl.asm" />
<YASM Include="..\libavcodec\x86\fmtconvert.asm" />
<YASM Include="..\libavcodec\x86\h263_loopfilter.asm" />
<YASM Include="..\libavcodec\x86\h264_chromamc.asm" />
<YASM Include="..\libavcodec\x86\h264_chromamc_10bit.asm" />
......@@ -145,9 +145,6 @@
</ClCompile>
<ClCompile Include="..\libavcodec\dv_profile.c">
</ClCompile>
<ClCompile Include="..\libavcodec\fmtconvert.c">
<ObjectFileName>$(IntDir)\libavcodec_fmtconvert.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\imgconvert.c">
</ClCompile>
<ClCompile Include="..\libavcodec\mathtables.c">
......@@ -220,6 +217,9 @@
</ClCompile>
<ClCompile Include="..\libavcodec\fft_init_table.c">
</ClCompile>
<ClCompile Include="..\libavcodec\fmtconvert.c">
<ObjectFileName>$(IntDir)\libavcodec_fmtconvert.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\golomb.c">
</ClCompile>
<ClCompile Include="..\libavcodec\h263dsp.c">
......@@ -1510,8 +1510,6 @@
</ClCompile>
<ClCompile Include="..\libavcodec\x86\constants.c">
</ClCompile>
<ClCompile Include="..\libavcodec\x86\fmtconvert_init.c">
</ClCompile>
<ClCompile Include="..\libavcodec\x86\ac3dsp_init.c">
</ClCompile>
<ClCompile Include="..\libavcodec\x86\audiodsp_init.c">
......@@ -1528,6 +1526,8 @@
</ClCompile>
<ClCompile Include="..\libavcodec\x86\flacdsp_init.c">
</ClCompile>
<ClCompile Include="..\libavcodec\x86\fmtconvert_init.c">
</ClCompile>
<ClCompile Include="..\libavcodec\x86\h263dsp_init.c">
</ClCompile>
<ClCompile Include="..\libavcodec\x86\h264chroma_init.c">
......
......@@ -24,9 +24,6 @@
<YASM Include="..\libavcodec\x86\deinterlace.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\fmtconvert.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\ac3dsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
......@@ -60,6 +57,9 @@
<YASM Include="..\libavcodec\x86\flac_dsp_gpl.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\fmtconvert.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h263_loopfilter.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
......@@ -248,9 +248,6 @@
<ClCompile Include="..\libavcodec\dv_profile.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\fmtconvert.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\imgconvert.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -353,6 +350,9 @@
<ClCompile Include="..\libavcodec\fft_init_table.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\fmtconvert.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\golomb.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -2246,9 +2246,6 @@
<ClCompile Include="..\libavcodec\x86\constants.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\fmtconvert_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\ac3dsp_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
......@@ -2273,6 +2270,9 @@
<ClCompile Include="..\libavcodec\x86\flacdsp_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\fmtconvert_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\x86\h263dsp_init.c">
<Filter>Source Files\libavcodec\x86</Filter>
</ClCompile>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册