Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
80c54ca5
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
80c54ca5
编写于
11月 08, 2014
作者:
M
Matthew Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update VS project files for recent merge.
上级
c152cd43
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
33 addition
and
6 deletion
+33
-6
SMC/config.asm
SMC/config.asm
+2
-0
SMC/config.h
SMC/config.h
+2
-0
SMC/libavcodec.def
SMC/libavcodec.def
+5
-0
SMC/libavcodec.vcxproj
SMC/libavcodec.vcxproj
+18
-3
SMC/libavcodec.vcxproj.filters
SMC/libavcodec.vcxproj.filters
+6
-3
未找到文件。
SMC/config.asm
浏览文件 @
80c54ca5
...
...
@@ -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
...
...
SMC/config.h
浏览文件 @
80c54ca5
...
...
@@ -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
...
...
SMC/libavcodec.def
浏览文件 @
80c54ca5
...
...
@@ -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
...
...
SMC/libavcodec.vcxproj
浏览文件 @
80c54ca5
...
...
@@ -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>
...
...
SMC/libavcodec.vcxproj.filters
浏览文件 @
80c54ca5
...
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录