提交 80c54ca5 编写于 作者: M Matthew Oliver

Update VS project files for recent merge.

上级 c152cd43
......@@ -213,6 +213,7 @@
%define HAVE_SYS_UN_H 0
%define HAVE_SYS_VIDEOIO_H 0
%define HAVE_TERMIOS_H 0
%define HAVE_UDPLITE_H 0
%define HAVE_UNISTD_H 1
%define HAVE_WINDOWS_H 1
%define HAVE_WINSOCK2_H 1
......@@ -1815,6 +1816,7 @@
%define CONFIG_TCP_PROTOCOL 1
%define CONFIG_TLS_PROTOCOL 1
%define CONFIG_UDP_PROTOCOL 1
%define CONFIG_UDPLITE_PROTOCOL 1
%define CONFIG_UNIX_PROTOCOL 0
%define CONFIG_LIBRTMP_PROTOCOL 1
%define CONFIG_LIBRTMPE_PROTOCOL 1
......
......@@ -240,6 +240,7 @@
#define HAVE_SYS_UN_H 0
#define HAVE_SYS_VIDEOIO_H 0
#define HAVE_TERMIOS_H 0
#define HAVE_UDPLITE_H 0
#define HAVE_UNISTD_H 1
#define HAVE_WINDOWS_H 1
#define HAVE_WINSOCK2_H 1
......@@ -1858,6 +1859,7 @@
#define CONFIG_TCP_PROTOCOL 1
#define CONFIG_TLS_PROTOCOL 1
#define CONFIG_UDP_PROTOCOL 1
#define CONFIG_UDPLITE_PROTOCOL 1
#define CONFIG_UNIX_PROTOCOL 0
#define CONFIG_LIBRTMP_PROTOCOL 1
#define CONFIG_LIBRTMPE_PROTOCOL 1
......
......@@ -91,6 +91,11 @@ EXPORTS
av_resample_compensate
av_resample_init
av_shrink_packet
av_vorbis_parse_frame
av_vorbis_parse_frame_flags
av_vorbis_parse_free
av_vorbis_parse_init
av_vorbis_parse_reset
av_xiphlacing
avcodec_align_dimensions
avcodec_align_dimensions2
......
......@@ -113,6 +113,9 @@
<ClCompile Include="..\libavcodec\utils.c">
<ObjectFileName>$(IntDir)\libavcodec_utils.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\vorbis_parser.c">
<ObjectFileName>$(IntDir)\libavcodec_vorbis_parser.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\aandcttab.c">
<ObjectFileName>$(IntDir)\libavcodec_aandcttab.obj</ObjectFileName>
</ClCompile>
......@@ -1844,9 +1847,6 @@
<ClCompile Include="..\libavcodec\dxva2_vc1.c">
<ObjectFileName>$(IntDir)\libavcodec_dxva2_vc1.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\vorbis_parser.c">
<ObjectFileName>$(IntDir)\libavcodec_vorbis_parser.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\libavcodec\libfdk-aacdec.c">
<ObjectFileName>$(IntDir)\libavcodec_libfdk-aacdec.obj</ObjectFileName>
</ClCompile>
......@@ -2239,6 +2239,7 @@
<ClInclude Include="..\libavcodec\vda.h" />
<ClInclude Include="..\libavcodec\vdpau.h" />
<ClInclude Include="..\libavcodec\version.h" />
<ClInclude Include="..\libavcodec\vorbis_parser.h" />
<ClInclude Include="..\libavcodec\xvmc.h" />
</ItemGroup>
<ItemGroup>
......@@ -2564,6 +2565,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
mkdir $(OutDir)\licenses
copy ..\COPYING.GPLv3 $(OutDir)\licenses\ffmpeg.txt</Command>
......@@ -2636,6 +2638,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
mkdir $(OutDir)\licenses
copy ..\COPYING.GPLv3 $(OutDir)\licenses\ffmpeg.txt</Command>
......@@ -2712,6 +2715,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
mkdir $(OutDir)\licenses
copy ..\COPYING.GPLv3 $(OutDir)\licenses\ffmpeg.txt</Command>
......@@ -2787,6 +2791,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
mkdir $(OutDir)\licenses
copy ..\COPYING.GPLv3 $(OutDir)\licenses\ffmpeg.txt</Command>
......@@ -2863,6 +2868,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
mkdir $(OutDir)\licenses
copy ..\COPYING.GPLv3 $(OutDir)\licenses\ffmpeg.txt</Command>
......@@ -2938,6 +2944,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
mkdir $(OutDir)\licenses
copy ..\COPYING.GPLv3 $(OutDir)\licenses\ffmpeg.txt</Command>
......@@ -3017,6 +3024,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
mkdir $(OutDir)\licenses
copy ..\COPYING.GPLv3 $(OutDir)\licenses\ffmpeg.txt</Command>
......@@ -3096,6 +3104,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
mkdir $(OutDir)\licenses
copy ..\COPYING.GPLv3 $(OutDir)\licenses\ffmpeg.txt</Command>
......@@ -3181,6 +3190,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
mkdir $(OutDir)\licenses
copy ..\COPYING.GPLv3 $(OutDir)\licenses\ffmpeg.txt</Command>
......@@ -3265,6 +3275,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
mkdir $(OutDir)\licenses
copy ..\COPYING.GPLv3 $(OutDir)\licenses\ffmpeg.txt</Command>
......@@ -3350,6 +3361,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
mkdir $(OutDir)\licenses
copy ..\COPYING.GPLv3 $(OutDir)\licenses\ffmpeg.txt</Command>
......@@ -3434,6 +3446,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
mkdir $(OutDir)\licenses
copy ..\COPYING.GPLv3 $(OutDir)\licenses\ffmpeg.txt</Command>
......@@ -3512,6 +3525,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
mkdir $(OutDir)\licenses
copy ..\COPYING.GPLv3 $(OutDir)\licenses\ffmpeg.txt</Command>
......@@ -3590,6 +3604,7 @@ copy ..\libavcodec\vaapi.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vda.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vdpau.h $(OutDir)\include\libavcodec
copy ..\libavcodec\version.h $(OutDir)\include\libavcodec
copy ..\libavcodec\vorbis_parser.h $(OutDir)\include\libavcodec
copy ..\libavcodec\xvmc.h $(OutDir)\include\libavcodec
mkdir $(OutDir)\licenses
copy ..\COPYING.GPLv3 $(OutDir)\licenses\ffmpeg.txt</Command>
......
......@@ -75,6 +75,9 @@
<ClCompile Include="..\libavcodec\utils.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\vorbis_parser.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\aandcttab.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -1806,9 +1809,6 @@
<ClCompile Include="..\libavcodec\dxva2_vc1.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\vorbis_parser.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
<ClCompile Include="..\libavcodec\libfdk-aacdec.c">
<Filter>Source Files\libavcodec</Filter>
</ClCompile>
......@@ -2219,6 +2219,9 @@
<ClInclude Include="..\libavcodec\version.h">
<Filter>Header Files\libavcodec</Filter>
</ClInclude>
<ClInclude Include="..\libavcodec\vorbis_parser.h">
<Filter>Header Files\libavcodec</Filter>
</ClInclude>
<ClInclude Include="..\libavcodec\xvmc.h">
<Filter>Header Files\libavcodec</Filter>
</ClInclude>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册