Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
a04478cb
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,发现更多精彩内容 >>
提交
a04478cb
编写于
10月 04, 2015
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
projects: Update for recent upstream merge.
上级
e2799ffc
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
39 addition
and
0 deletion
+39
-0
SMP/config.asm
SMP/config.asm
+3
-0
SMP/config.h
SMP/config.h
+3
-0
SMP/libavcodec.vcxproj
SMP/libavcodec.vcxproj
+4
-0
SMP/libavcodec.vcxproj.filters
SMP/libavcodec.vcxproj.filters
+9
-0
SMP/libavfilter.vcxproj
SMP/libavfilter.vcxproj
+4
-0
SMP/libavfilter.vcxproj.filters
SMP/libavfilter.vcxproj.filters
+6
-0
SMP/libavformat.vcxproj
SMP/libavformat.vcxproj
+4
-0
SMP/libavformat.vcxproj.filters
SMP/libavformat.vcxproj.filters
+6
-0
未找到文件。
SMP/config.asm
浏览文件 @
a04478cb
...
...
@@ -409,6 +409,7 @@
%define CONFIG_TRANSCODING_EXAMPLE 0
%define CONFIG_AVISYNTH 1
%define CONFIG_BZLIB 1
%define CONFIG_CHROMAPRINT 0
%define CONFIG_CRYSTALHD 0
%define CONFIG_DECKLINK 0
%define CONFIG_FREI0R 0
...
...
@@ -788,6 +789,7 @@
%define CONFIG_RV40_DECODER 1
%define CONFIG_S302M_DECODER 1
%define CONFIG_SANM_DECODER 1
%define CONFIG_SCREENPRESSO_DECODER 1
%define CONFIG_SGI_DECODER 1
%define CONFIG_SGIRLE_DECODER 1
%define CONFIG_SMACKER_DECODER 1
...
...
@@ -1917,6 +1919,7 @@
%define CONFIG_WTV_MUXER 1
%define CONFIG_WV_MUXER 1
%define CONFIG_YUV4MPEGPIPE_MUXER 1
%define CONFIG_CHROMAPRINT_MUXER 0
%define CONFIG_LIBNUT_MUXER 0
%define CONFIG_ALSA_OUTDEV 0
%define CONFIG_CACA_OUTDEV 0
...
...
SMP/config.h
浏览文件 @
a04478cb
...
...
@@ -448,6 +448,7 @@
#define CONFIG_TRANSCODING_EXAMPLE 0
#define CONFIG_AVISYNTH 1
#define CONFIG_BZLIB 1
#define CONFIG_CHROMAPRINT 0
#define CONFIG_CRYSTALHD 0
#define CONFIG_DECKLINK 0
#define CONFIG_FREI0R 0
...
...
@@ -835,6 +836,7 @@
#define CONFIG_RV40_DECODER 1
#define CONFIG_S302M_DECODER 1
#define CONFIG_SANM_DECODER 1
#define CONFIG_SCREENPRESSO_DECODER 1
#define CONFIG_SGI_DECODER 1
#define CONFIG_SGIRLE_DECODER 1
#define CONFIG_SMACKER_DECODER 1
...
...
@@ -1964,6 +1966,7 @@
#define CONFIG_WTV_MUXER 1
#define CONFIG_WV_MUXER 1
#define CONFIG_YUV4MPEGPIPE_MUXER 1
#define CONFIG_CHROMAPRINT_MUXER 0
#define CONFIG_LIBNUT_MUXER 0
#define CONFIG_ALSA_OUTDEV 0
#define CONFIG_CACA_OUTDEV 0
...
...
SMP/libavcodec.vcxproj
浏览文件 @
a04478cb
...
...
@@ -125,8 +125,10 @@
<YASM
Include=
"..\libavcodec\x86\vorbisdsp.asm"
/>
<YASM
Include=
"..\libavcodec\x86\vp6dsp.asm"
/>
<YASM
Include=
"..\libavcodec\x86\vp9intrapred.asm"
/>
<YASM
Include=
"..\libavcodec\x86\vp9intrapred_16bpp.asm"
/>
<YASM
Include=
"..\libavcodec\x86\vp9itxfm.asm"
/>
<YASM
Include=
"..\libavcodec\x86\vp9lpf.asm"
/>
<YASM
Include=
"..\libavcodec\x86\vp9lpf_16bpp.asm"
/>
<YASM
Include=
"..\libavcodec\x86\vp9mc.asm"
/>
<YASM
Include=
"..\libavcodec\x86\vp9mc_16bpp.asm"
/>
</ItemGroup>
...
...
@@ -1159,6 +1161,8 @@
</ClCompile>
<ClCompile
Include=
"..\libavcodec\sanm.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\screenpresso.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\sgidec.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\sgienc.c"
>
...
...
SMP/libavcodec.vcxproj.filters
浏览文件 @
a04478cb
...
...
@@ -219,12 +219,18 @@
<YASM
Include=
"..\libavcodec\x86\vp9intrapred.asm"
>
<Filter>
Source Files\libavcodec\x86
</Filter>
</YASM>
<YASM
Include=
"..\libavcodec\x86\vp9intrapred_16bpp.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\vp9lpf_16bpp.asm"
>
<Filter>
Source Files\libavcodec\x86
</Filter>
</YASM>
<YASM
Include=
"..\libavcodec\x86\vp9mc.asm"
>
<Filter>
Source Files\libavcodec\x86
</Filter>
</YASM>
...
...
@@ -1733,6 +1739,9 @@
<ClCompile
Include=
"..\libavcodec\sanm.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\screenpresso.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\sgidec.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
SMP/libavfilter.vcxproj
浏览文件 @
a04478cb
...
...
@@ -59,6 +59,7 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<YASM
Include=
"..\libavfilter\x86\vf_blend.asm"
/>
<YASM
Include=
"..\libavfilter\x86\vf_fspp.asm"
/>
<YASM
Include=
"..\libavfilter\x86\vf_gradfun.asm"
/>
<YASM
Include=
"..\libavfilter\x86\vf_hqdn3d.asm"
/>
...
...
@@ -230,6 +231,7 @@
<ClCompile
Include=
"..\libavfilter\vf_blackframe.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_blend.c"
>
<ObjectFileName>
$(IntDir)\libavfilter_vf_blend.obj
</ObjectFileName>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\dualinput.c"
>
</ClCompile>
...
...
@@ -503,6 +505,8 @@
</ClCompile>
<ClCompile
Include=
"..\libavfilter\log2_tab.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\x86\vf_blend_init.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\x86\vf_eq.c"
>
<ObjectFileName>
$(IntDir)\libavfilter_x86_vf_eq.obj
</ObjectFileName>
</ClCompile>
...
...
SMP/libavfilter.vcxproj.filters
浏览文件 @
a04478cb
...
...
@@ -21,6 +21,9 @@
</Filter>
</ItemGroup>
<ItemGroup>
<YASM
Include=
"..\libavfilter\x86\vf_blend.asm"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
</YASM>
<YASM
Include=
"..\libavfilter\x86\vf_fspp.asm"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
</YASM>
...
...
@@ -689,6 +692,9 @@
<ClCompile
Include=
"..\libavfilter\log2_tab.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\x86\vf_blend_init.c"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\x86\vf_eq.c"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
</ClCompile>
...
...
SMP/libavformat.vcxproj
浏览文件 @
a04478cb
...
...
@@ -495,6 +495,8 @@
</ClCompile>
<ClCompile
Include=
"..\libavformat\microdvdenc.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\mlpdec.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\mlvdec.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\mm.c"
>
...
...
@@ -685,6 +687,8 @@
</ClCompile>
<ClCompile
Include=
"..\libavformat\segment.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\shortendec.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\siff.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\smacker.c"
>
...
...
SMP/libavformat.vcxproj.filters
浏览文件 @
a04478cb
...
...
@@ -672,6 +672,9 @@
<ClCompile
Include=
"..\libavformat\microdvdenc.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\mlpdec.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\mlvdec.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
...
...
@@ -957,6 +960,9 @@
<ClCompile
Include=
"..\libavformat\segment.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\shortendec.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\siff.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录