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

projects: Update for recent merge/update.

上级 79a4484d
......@@ -31,6 +31,7 @@ EXPORTS
av_destruct_packet
av_dup_packet
av_dv_codec_profile
av_dv_codec_profile2
av_dv_frame_profile
av_fast_padded_malloc
av_fast_padded_mallocz
......
此差异已折叠。
......@@ -20,6 +20,200 @@
<UniqueIdentifier>{bf017c32-250d-47da-b7e6-d5a5091cb1e6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<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>
<YASM Include="..\libavcodec\x86\audiodsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\blockdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\bswapdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\dct32.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\diracdsp_yasm.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\dwt_yasm.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\dnxhdenc.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\fft.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\flacdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\flac_dsp_gpl.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h263_loopfilter.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_chromamc.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_chromamc_10bit.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_deblock.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_deblock_10bit.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_idct.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_idct_10bit.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_weight.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_weight_10bit.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_intrapred.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_intrapred_10bit.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_qpel_8bit.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_qpel_10bit.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\fpel.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\qpel.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\hpeldsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\huffyuvdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\idctdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\lossless_audiodsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\lossless_videodsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\me_cmp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\imdct36.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\mpegvideoencdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\pixblockdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\qpeldsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\videodsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp3dsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\sbrdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\pngdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\dcadsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\hevc_mc.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\hevc_deblock.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\hevc_idct.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\hevc_res_add.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\mlpdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\proresdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\rv34dsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\rv40dsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\svq1enc.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\ttadsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\v210enc.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\v210.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vc1dsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vorbisdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp6dsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp8dsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp8dsp_loopfilter.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp9intrapred.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp9itxfm.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp9lpf.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp9mc.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libavcodec\allcodecs.c">
<Filter>Source Files\libavcodec</Filter>
......@@ -2229,200 +2423,6 @@
<Filter>Header Files\libavcodec</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<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>
<YASM Include="..\libavcodec\x86\audiodsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\blockdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\bswapdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\dct32.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\diracdsp_yasm.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\dwt_yasm.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\dnxhdenc.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\fft.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\flacdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\flac_dsp_gpl.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h263_loopfilter.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_chromamc.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_chromamc_10bit.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_deblock.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_deblock_10bit.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_idct.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_idct_10bit.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_weight.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_weight_10bit.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_intrapred.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_intrapred_10bit.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_qpel_8bit.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\h264_qpel_10bit.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\fpel.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\qpel.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\hpeldsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\huffyuvdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\idctdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\lossless_audiodsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\lossless_videodsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\me_cmp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\imdct36.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\mpegvideoencdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\pixblockdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\qpeldsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\videodsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp3dsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\sbrdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\pngdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\dcadsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\hevc_mc.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\hevc_deblock.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\hevc_idct.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\hevc_res_add.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\mlpdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\proresdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\rv34dsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\rv40dsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\svq1enc.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\ttadsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\v210enc.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\v210.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vc1dsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vorbisdsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp6dsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp8dsp.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp8dsp_loopfilter.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp9intrapred.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp9itxfm.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp9lpf.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
<YASM Include="..\libavcodec\x86\vp9mc.asm">
<Filter>Source Files\libavcodec\x86</Filter>
</YASM>
</ItemGroup>
<ItemGroup>
<None Include=".\libavcodec.def">
<Filter>Resource Files</Filter>
......
......@@ -60,46 +60,32 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libavdevice\alldevices.c">
<ObjectFileName>$(IntDir)\libavdevice_alldevices.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavdevice\avdevice.c">
<ObjectFileName>$(IntDir)\libavdevice_avdevice.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavdevice\dshow.c">
<ObjectFileName>$(IntDir)\libavdevice_dshow.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavdevice\dshow_enummediatypes.c">
<ObjectFileName>$(IntDir)\libavdevice_dshow_enummediatypes.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavdevice\dshow_enumpins.c">
<ObjectFileName>$(IntDir)\libavdevice_dshow_enumpins.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavdevice\dshow_filter.c">
<ObjectFileName>$(IntDir)\libavdevice_dshow_filter.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavdevice\dshow_pin.c">
<ObjectFileName>$(IntDir)\libavdevice_dshow_pin.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavdevice\dshow_common.c">
<ObjectFileName>$(IntDir)\libavdevice_dshow_common.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavdevice\lavfi.c">
<ObjectFileName>$(IntDir)\libavdevice_lavfi.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavdevice\opengl_enc.c">
<ObjectFileName>$(IntDir)\libavdevice_opengl_enc.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavdevice\sdl.c">
<ObjectFileName>$(IntDir)\libavdevice_sdl.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavdevice\vfwcap.c">
<ObjectFileName>$(IntDir)\libavdevice_vfwcap.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavdevice\libcdio.c">
<ObjectFileName>$(IntDir)\libavdevice_libcdio.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavdevice\file_open.c">
<ObjectFileName>$(IntDir)\libavdevice_file_open.obj</ObjectFileName>
</ClCompile>
</ItemGroup>
<ItemGroup>
......
此差异已折叠。
......@@ -23,6 +23,35 @@
<UniqueIdentifier>{fd9e10e9-18f6-437d-b5d7-17290540c8b8}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<YASM Include="..\libavfilter\x86\vf_gradfun.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\vf_hqdn3d.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\vf_idet.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\vf_interlace.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\vf_pullup.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\af_volume.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\vf_yadif.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\yadif-16.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\yadif-10.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libavfilter\allfilters.c">
<Filter>Source Files\libavfilter</Filter>
......@@ -615,35 +644,6 @@
<Filter>Header Files\libavfilter</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\libavfilter\x86\vf_gradfun.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\vf_hqdn3d.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\vf_idet.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\vf_interlace.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\vf_pullup.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\af_volume.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\vf_yadif.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\yadif-16.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
<YASM Include="..\libavfilter\x86\yadif-10.asm">
<Filter>Source Files\libavfilter\x86</Filter>
</YASM>
</ItemGroup>
<ItemGroup>
<None Include=".\libavfilter.def">
<Filter>Resource Files</Filter>
......
此差异已折叠。
......@@ -58,204 +58,149 @@
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<YASM Include="..\libavutil\x86\cpuid.asm" />
<YASM Include="..\libavutil\x86\emms.asm" />
<YASM Include="..\libavutil\x86\float_dsp.asm" />
<YASM Include="..\libavutil\x86\lls.asm" />
<YASM Include="..\libavutil\x86\pixelutils.asm" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libavutil\..\compat\msvcrt\snprintf.c">
<ObjectFileName>$(IntDir)\compat_msvcrt_snprintf.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\..\compat\strtod.c">
<ObjectFileName>$(IntDir)\compat_strtod.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\..\compat\getopt.c">
<ObjectFileName>$(IntDir)\compat_getopt.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\adler32.c">
<ObjectFileName>$(IntDir)\libavutil_adler32.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\aes.c">
<ObjectFileName>$(IntDir)\libavutil_aes.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\atomic.c">
<ObjectFileName>$(IntDir)\libavutil_atomic.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\audio_fifo.c">
<ObjectFileName>$(IntDir)\libavutil_audio_fifo.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\avstring.c">
<ObjectFileName>$(IntDir)\libavutil_avstring.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\base64.c">
<ObjectFileName>$(IntDir)\libavutil_base64.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\blowfish.c">
<ObjectFileName>$(IntDir)\libavutil_blowfish.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\bprint.c">
<ObjectFileName>$(IntDir)\libavutil_bprint.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\buffer.c">
<ObjectFileName>$(IntDir)\libavutil_buffer.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\cast5.c">
<ObjectFileName>$(IntDir)\libavutil_cast5.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\channel_layout.c">
<ObjectFileName>$(IntDir)\libavutil_channel_layout.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\cpu.c">
<ObjectFileName>$(IntDir)\libavutil_cpu.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\crc.c">
<ObjectFileName>$(IntDir)\libavutil_crc.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\des.c">
<ObjectFileName>$(IntDir)\libavutil_des.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\display.c">
<ObjectFileName>$(IntDir)\libavutil_display.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\downmix_info.c">
<ObjectFileName>$(IntDir)\libavutil_downmix_info.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\error.c">
<ObjectFileName>$(IntDir)\libavutil_error.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\eval.c">
<ObjectFileName>$(IntDir)\libavutil_eval.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\fifo.c">
<ObjectFileName>$(IntDir)\libavutil_fifo.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\file.c">
<ObjectFileName>$(IntDir)\libavutil_file.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\file_open.c">
<ObjectFileName>$(IntDir)\libavutil_file_open.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\float_dsp.c">
<ObjectFileName>$(IntDir)\libavutil_float_dsp.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\fixed_dsp.c">
<ObjectFileName>$(IntDir)\libavutil_fixed_dsp.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\frame.c">
<ObjectFileName>$(IntDir)\libavutil_frame.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\hash.c">
<ObjectFileName>$(IntDir)\libavutil_hash.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\hmac.c">
<ObjectFileName>$(IntDir)\libavutil_hmac.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\imgutils.c">
<ObjectFileName>$(IntDir)\libavutil_imgutils.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\intmath.c">
<ObjectFileName>$(IntDir)\libavutil_intmath.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\lfg.c">
<ObjectFileName>$(IntDir)\libavutil_lfg.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\lls.c">
<ObjectFileName>$(IntDir)\libavutil_lls.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\log.c">
<ObjectFileName>$(IntDir)\libavutil_log.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\log2_tab.c">
<ObjectFileName>$(IntDir)\libavutil_log2_tab.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\mathematics.c">
<ObjectFileName>$(IntDir)\libavutil_mathematics.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\md5.c">
<ObjectFileName>$(IntDir)\libavutil_md5.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\mem.c">
<ObjectFileName>$(IntDir)\libavutil_mem.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\murmur3.c">
<ObjectFileName>$(IntDir)\libavutil_murmur3.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\dict.c">
<ObjectFileName>$(IntDir)\libavutil_dict.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\opt.c">
<ObjectFileName>$(IntDir)\libavutil_opt.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\parseutils.c">
<ObjectFileName>$(IntDir)\libavutil_parseutils.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\pixdesc.c">
<ObjectFileName>$(IntDir)\libavutil_pixdesc.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\pixelutils.c">
<ObjectFileName>$(IntDir)\libavutil_pixelutils.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\random_seed.c">
<ObjectFileName>$(IntDir)\libavutil_random_seed.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\rational.c">
<ObjectFileName>$(IntDir)\libavutil_rational.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\rc4.c">
<ObjectFileName>$(IntDir)\libavutil_rc4.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\ripemd.c">
<ObjectFileName>$(IntDir)\libavutil_ripemd.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\samplefmt.c">
<ObjectFileName>$(IntDir)\libavutil_samplefmt.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\sha.c">
<ObjectFileName>$(IntDir)\libavutil_sha.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\sha512.c">
<ObjectFileName>$(IntDir)\libavutil_sha512.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\stereo3d.c">
<ObjectFileName>$(IntDir)\libavutil_stereo3d.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\threadmessage.c">
<ObjectFileName>$(IntDir)\libavutil_threadmessage.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\time.c">
<ObjectFileName>$(IntDir)\libavutil_time.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\timecode.c">
<ObjectFileName>$(IntDir)\libavutil_timecode.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\tree.c">
<ObjectFileName>$(IntDir)\libavutil_tree.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\utils.c">
<ObjectFileName>$(IntDir)\libavutil_utils.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\xga_font_data.c">
<ObjectFileName>$(IntDir)\libavutil_xga_font_data.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\xtea.c">
<ObjectFileName>$(IntDir)\libavutil_xtea.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\lzo.c">
<ObjectFileName>$(IntDir)\libavutil_lzo.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\opencl.c">
<ObjectFileName>$(IntDir)\libavutil_opencl.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\opencl_internal.c">
<ObjectFileName>$(IntDir)\libavutil_opencl_internal.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\x86\cpu.c">
<ObjectFileName>$(IntDir)\libavutil_x86_cpu.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\x86\float_dsp_init.c">
<ObjectFileName>$(IntDir)\libavutil_x86_float_dsp_init.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\x86\lls_init.c">
<ObjectFileName>$(IntDir)\libavutil_x86_lls_init.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavutil\x86\pixelutils_init.c">
<ObjectFileName>$(IntDir)\libavutil_x86_pixelutils_init.obj</ObjectFileName>
</ClCompile>
</ItemGroup>
<ItemGroup>
......@@ -321,13 +266,6 @@
<ClInclude Include="..\libavutil\lzo.h" />
<ClInclude Include="..\libavutil\opencl.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\libavutil\x86\cpuid.asm" />
<YASM Include="..\libavutil\x86\emms.asm" />
<YASM Include="..\libavutil\x86\float_dsp.asm" />
<YASM Include="..\libavutil\x86\lls.asm" />
<YASM Include="..\libavutil\x86\pixelutils.asm" />
</ItemGroup>
<ItemGroup>
<None Include=".\libavutil.def" />
</ItemGroup>
......
......@@ -26,6 +26,23 @@
<UniqueIdentifier>{f026e68e-ff14-4bf4-8758-6384ac7bcfaf}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<YASM Include="..\libavutil\x86\cpuid.asm">
<Filter>Source Files\libavutil\x86</Filter>
</YASM>
<YASM Include="..\libavutil\x86\emms.asm">
<Filter>Source Files\libavutil\x86</Filter>
</YASM>
<YASM Include="..\libavutil\x86\float_dsp.asm">
<Filter>Source Files\libavutil\x86</Filter>
</YASM>
<YASM Include="..\libavutil\x86\lls.asm">
<Filter>Source Files\libavutil\x86</Filter>
</YASM>
<YASM Include="..\libavutil\x86\pixelutils.asm">
<Filter>Source Files\libavutil\x86</Filter>
</YASM>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libavutil\..\compat\msvcrt\snprintf.c">
<Filter>Source Files\compat\msvcrt</Filter>
......@@ -411,23 +428,6 @@
<Filter>Header Files\libavutil</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\libavutil\x86\cpuid.asm">
<Filter>Source Files\libavutil\x86</Filter>
</YASM>
<YASM Include="..\libavutil\x86\emms.asm">
<Filter>Source Files\libavutil\x86</Filter>
</YASM>
<YASM Include="..\libavutil\x86\float_dsp.asm">
<Filter>Source Files\libavutil\x86</Filter>
</YASM>
<YASM Include="..\libavutil\x86\lls.asm">
<Filter>Source Files\libavutil\x86</Filter>
</YASM>
<YASM Include="..\libavutil\x86\pixelutils.asm">
<Filter>Source Files\libavutil\x86</Filter>
</YASM>
</ItemGroup>
<ItemGroup>
<None Include=".\libavutil.def">
<Filter>Resource Files</Filter>
......
#ifndef AVUTIL_FFVERSION_H
#define AVUTIL_FFVERSION_H
#define FFMPEG_VERSION "2.4.git"
#define FFMPEG_VERSION "2.5.git"
#endif /* AVUTIL_FFVERSION_H */
......@@ -60,7 +60,6 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libpostproc\postprocess.c">
<ObjectFileName>$(IntDir)\libpostproc_postprocess.obj</ObjectFileName>
</ClCompile>
</ItemGroup>
<ItemGroup>
......
......@@ -58,15 +58,17 @@
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<YASM Include="..\libswresample\x86\audio_convert.asm" />
<YASM Include="..\libswresample\x86\rematrix.asm" />
<YASM Include="..\libswresample\x86\resample.asm" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libswresample\audioconvert.c">
<ObjectFileName>$(IntDir)\libswresample_audioconvert.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libswresample\dither.c">
<ObjectFileName>$(IntDir)\libswresample_dither.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libswresample\options.c">
<ObjectFileName>$(IntDir)\libswresample_options.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libswresample\rematrix.c">
<ObjectFileName>$(IntDir)\libswresample_rematrix.obj</ObjectFileName>
......@@ -75,39 +77,26 @@
<ObjectFileName>$(IntDir)\libswresample_resample.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libswresample\resample_dsp.c">
<ObjectFileName>$(IntDir)\libswresample_resample_dsp.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libswresample\swresample.c">
<ObjectFileName>$(IntDir)\libswresample_swresample.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libswresample\swresample_frame.c">
<ObjectFileName>$(IntDir)\libswresample_swresample_frame.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libswresample\soxr_resample.c">
<ObjectFileName>$(IntDir)\libswresample_soxr_resample.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libswresample\log2_tab.c">
<ObjectFileName>$(IntDir)\libswresample_log2_tab.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libswresample\x86\audio_convert_init.c">
<ObjectFileName>$(IntDir)\libswresample_x86_audio_convert_init.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libswresample\x86\rematrix_init.c">
<ObjectFileName>$(IntDir)\libswresample_x86_rematrix_init.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libswresample\x86\resample_init.c">
<ObjectFileName>$(IntDir)\libswresample_x86_resample_init.obj</ObjectFileName>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\libswresample\swresample.h" />
<ClInclude Include="..\libswresample\version.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\libswresample\x86\audio_convert.asm" />
<YASM Include="..\libswresample\x86\rematrix.asm" />
<YASM Include="..\libswresample\x86\resample.asm" />
</ItemGroup>
<ItemGroup>
<None Include=".\libswresample.def" />
</ItemGroup>
......
......@@ -20,6 +20,17 @@
<UniqueIdentifier>{bf017c32-250d-47da-b7e6-d5a5091cb1e6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<YASM Include="..\libswresample\x86\audio_convert.asm">
<Filter>Source Files\libswresample\x86</Filter>
</YASM>
<YASM Include="..\libswresample\x86\rematrix.asm">
<Filter>Source Files\libswresample\x86</Filter>
</YASM>
<YASM Include="..\libswresample\x86\resample.asm">
<Filter>Source Files\libswresample\x86</Filter>
</YASM>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libswresample\audioconvert.c">
<Filter>Source Files\libswresample</Filter>
......@@ -69,17 +80,6 @@
<Filter>Header Files\libswresample</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\libswresample\x86\audio_convert.asm">
<Filter>Source Files\libswresample\x86</Filter>
</YASM>
<YASM Include="..\libswresample\x86\rematrix.asm">
<Filter>Source Files\libswresample\x86</Filter>
</YASM>
<YASM Include="..\libswresample\x86\resample.asm">
<Filter>Source Files\libswresample\x86</Filter>
</YASM>
</ItemGroup>
<ItemGroup>
<None Include=".\libswresample.def">
<Filter>Resource Files</Filter>
......
此差异已折叠。
......@@ -20,6 +20,17 @@
<UniqueIdentifier>{bf017c32-250d-47da-b7e6-d5a5091cb1e6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<YASM Include="..\libswscale\x86\input.asm">
<Filter>Source Files\libswscale\x86</Filter>
</YASM>
<YASM Include="..\libswscale\x86\output.asm">
<Filter>Source Files\libswscale\x86</Filter>
</YASM>
<YASM Include="..\libswscale\x86\scale.asm">
<Filter>Source Files\libswscale\x86</Filter>
</YASM>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\libswscale\hscale_fast_bilinear.c">
<Filter>Source Files\libswscale</Filter>
......@@ -72,17 +83,6 @@
<Filter>Header Files\libswscale</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\libswscale\x86\input.asm">
<Filter>Source Files\libswscale\x86</Filter>
</YASM>
<YASM Include="..\libswscale\x86\output.asm">
<Filter>Source Files\libswscale\x86</Filter>
</YASM>
<YASM Include="..\libswscale\x86\scale.asm">
<Filter>Source Files\libswscale\x86</Filter>
</YASM>
</ItemGroup>
<ItemGroup>
<None Include=".\libswscale.def">
<Filter>Resource Files</Filter>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册