Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
6665ae04
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,发现更多精彩内容 >>
提交
6665ae04
编写于
2月 05, 2018
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
projects: Update for recent upstream merge.
上级
10957276
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
4 deletion
+16
-4
SMP/config.asm
SMP/config.asm
+1
-0
SMP/config.h
SMP/config.h
+1
-0
SMP/libavfilter.vcxproj
SMP/libavfilter.vcxproj
+5
-1
SMP/libavfilter.vcxproj.filters
SMP/libavfilter.vcxproj.filters
+9
-3
未找到文件。
SMP/config.asm
浏览文件 @
6665ae04
...
@@ -420,6 +420,7 @@
...
@@ -420,6 +420,7 @@
%define CONFIG_TRANSCODE_AAC_EXAMPLE 0
%define CONFIG_TRANSCODE_AAC_EXAMPLE 0
%define CONFIG_TRANSCODING_EXAMPLE 0
%define CONFIG_TRANSCODING_EXAMPLE 0
%define CONFIG_VAAPI_ENCODE_EXAMPLE 0
%define CONFIG_VAAPI_ENCODE_EXAMPLE 0
%define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
%define CONFIG_AVISYNTH 1
%define CONFIG_AVISYNTH 1
%define CONFIG_FREI0R 0
%define CONFIG_FREI0R 0
%define CONFIG_LIBCDIO 1
%define CONFIG_LIBCDIO 1
...
...
SMP/config.h
浏览文件 @
6665ae04
...
@@ -470,6 +470,7 @@
...
@@ -470,6 +470,7 @@
#define CONFIG_TRANSCODE_AAC_EXAMPLE 0
#define CONFIG_TRANSCODE_AAC_EXAMPLE 0
#define CONFIG_TRANSCODING_EXAMPLE 0
#define CONFIG_TRANSCODING_EXAMPLE 0
#define CONFIG_VAAPI_ENCODE_EXAMPLE 0
#define CONFIG_VAAPI_ENCODE_EXAMPLE 0
#define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
#define CONFIG_AVISYNTH 1
#define CONFIG_AVISYNTH 1
#define CONFIG_FREI0R 0
#define CONFIG_FREI0R 0
#define CONFIG_LIBCDIO 1
#define CONFIG_LIBCDIO 1
...
...
SMP/libavfilter.vcxproj
浏览文件 @
6665ae04
...
@@ -73,6 +73,7 @@
...
@@ -73,6 +73,7 @@
<NASM
Include=
"..\libavfilter\x86\vf_blend.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_blend.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_bwdif.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_bwdif.asm"
/>
<NASM
Include=
"..\libavfilter\x86\colorspacedsp.asm"
/>
<NASM
Include=
"..\libavfilter\x86\colorspacedsp.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_framerate.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_fspp.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_fspp.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_gradfun.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_gradfun.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_hflip.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_hflip.asm"
/>
...
@@ -256,7 +257,6 @@
...
@@ -256,7 +257,6 @@
<ClCompile
Include=
"..\libavfilter\vf_format.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_format.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_fps.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_fps.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_framepack.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_framepack.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_framerate.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_framestep.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_framestep.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_gblur.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_gblur.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_geq.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_geq.c"
/>
...
@@ -372,6 +372,7 @@
...
@@ -372,6 +372,7 @@
<ClCompile
Include=
"..\libavfilter\x86\colorspacedsp_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\colorspacedsp_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_fspp_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_fspp_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_gradfun_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_gradfun_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_framerate_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_hflip_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_hflip_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_hqdn3d_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_hqdn3d_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_idet_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_idet_init.c"
/>
...
@@ -407,6 +408,9 @@
...
@@ -407,6 +408,9 @@
<ClCompile
Include=
"..\libavfilter\colorspacedsp.c"
>
<ClCompile
Include=
"..\libavfilter\colorspacedsp.c"
>
<ObjectFileName>
$(IntDir)\libavfilter_colorspacedsp.obj
</ObjectFileName>
<ObjectFileName>
$(IntDir)\libavfilter_colorspacedsp.obj
</ObjectFileName>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_framerate.c"
>
<ObjectFileName>
$(IntDir)\libavfilter_vf_framerate.obj
</ObjectFileName>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_fspp.c"
>
<ClCompile
Include=
"..\libavfilter\vf_fspp.c"
>
<ObjectFileName>
$(IntDir)\libavfilter_vf_fspp.obj
</ObjectFileName>
<ObjectFileName>
$(IntDir)\libavfilter_vf_fspp.obj
</ObjectFileName>
</ClCompile>
</ClCompile>
...
...
SMP/libavfilter.vcxproj.filters
浏览文件 @
6665ae04
...
@@ -46,6 +46,9 @@
...
@@ -46,6 +46,9 @@
<NASM
Include=
"..\libavfilter\x86\colorspacedsp.asm"
>
<NASM
Include=
"..\libavfilter\x86\colorspacedsp.asm"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
<Filter>
Source Files\libavfilter\x86
</Filter>
</NASM>
</NASM>
<NASM
Include=
"..\libavfilter\x86\vf_framerate.asm"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
</NASM>
<NASM
Include=
"..\libavfilter\x86\vf_fspp.asm"
>
<NASM
Include=
"..\libavfilter\x86\vf_fspp.asm"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
<Filter>
Source Files\libavfilter\x86
</Filter>
</NASM>
</NASM>
...
@@ -591,9 +594,6 @@
...
@@ -591,9 +594,6 @@
<ClCompile
Include=
"..\libavfilter\vf_framepack.c"
>
<ClCompile
Include=
"..\libavfilter\vf_framepack.c"
>
<Filter>
Source Files\libavfilter
</Filter>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_framerate.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_framestep.c"
>
<ClCompile
Include=
"..\libavfilter\vf_framestep.c"
>
<Filter>
Source Files\libavfilter
</Filter>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
</ClCompile>
...
@@ -939,6 +939,9 @@
...
@@ -939,6 +939,9 @@
<ClCompile
Include=
"..\libavfilter\x86\vf_gradfun_init.c"
>
<ClCompile
Include=
"..\libavfilter\x86\vf_gradfun_init.c"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
<Filter>
Source Files\libavfilter\x86
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\x86\vf_framerate_init.c"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\x86\vf_hflip_init.c"
>
<ClCompile
Include=
"..\libavfilter\x86\vf_hflip_init.c"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
<Filter>
Source Files\libavfilter\x86
</Filter>
</ClCompile>
</ClCompile>
...
@@ -1014,6 +1017,9 @@
...
@@ -1014,6 +1017,9 @@
<ClCompile
Include=
"..\libavfilter\colorspacedsp.c"
>
<ClCompile
Include=
"..\libavfilter\colorspacedsp.c"
>
<Filter>
Source Files\libavfilter
</Filter>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_framerate.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_fspp.c"
>
<ClCompile
Include=
"..\libavfilter\vf_fspp.c"
>
<Filter>
Source Files\libavfilter
</Filter>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
</ClCompile>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录