Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
8d7ac27f
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,发现更多精彩内容 >>
提交
8d7ac27f
编写于
8月 28, 2016
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
projects: Update for recent upstream merge.
上级
ff2977ca
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
48 addition
and
0 deletion
+48
-0
SMP/config.asm
SMP/config.asm
+8
-0
SMP/config.h
SMP/config.h
+8
-0
SMP/libavcodec.vcxproj
SMP/libavcodec.vcxproj
+1
-0
SMP/libavcodec.vcxproj.filters
SMP/libavcodec.vcxproj.filters
+3
-0
SMP/libavfilter.vcxproj
SMP/libavfilter.vcxproj
+7
-0
SMP/libavfilter.vcxproj.filters
SMP/libavfilter.vcxproj.filters
+21
-0
未找到文件。
SMP/config.asm
浏览文件 @
8d7ac27f
...
...
@@ -1775,6 +1775,7 @@
%define CONFIG_HWDOWNLOAD_FILTER 1
%define CONFIG_HWUPLOAD_FILTER 1
%define CONFIG_HWUPLOAD_CUDA_FILTER 0
%define CONFIG_HYSTERESIS_FILTER 1
%define CONFIG_IDET_FILTER 1
%define CONFIG_IL_FILTER 1
%define CONFIG_INFLATE_FILTER 1
...
...
@@ -1784,13 +1785,17 @@
%define CONFIG_LENSCORRECTION_FILTER 1
%define CONFIG_LOOP_FILTER 1
%define CONFIG_LUT_FILTER 1
%define CONFIG_LUT2_FILTER 1
%define CONFIG_LUT3D_FILTER 1
%define CONFIG_LUTRGB_FILTER 1
%define CONFIG_LUTYUV_FILTER 1
%define CONFIG_MASKEDCLAMP_FILTER 1
%define CONFIG_MASKEDMERGE_FILTER 1
%define CONFIG_MCDEINT_FILTER 1
%define CONFIG_MERGEPLANES_FILTER 1
%define CONFIG_MESTIMATE_FILTER 1
%define CONFIG_METADATA_FILTER 1
%define CONFIG_MINTERPOLATE_FILTER 1
%define CONFIG_MPDECIMATE_FILTER 1
%define CONFIG_NEGATE_FILTER 1
%define CONFIG_NNEDI_FILTER 1
...
...
@@ -1860,6 +1865,7 @@
%define CONFIG_TRIM_FILTER 1
%define CONFIG_UNSHARP_FILTER 1
%define CONFIG_USPP_FILTER 1
%define CONFIG_VAGUEDENOISER_FILTER 1
%define CONFIG_VECTORSCOPE_FILTER 1
%define CONFIG_VFLIP_FILTER 1
%define CONFIG_VIDSTABDETECT_FILTER 0
...
...
@@ -1888,6 +1894,7 @@
%define CONFIG_SMPTEHDBARS_FILTER 1
%define CONFIG_TESTSRC_FILTER 1
%define CONFIG_TESTSRC2_FILTER 1
%define CONFIG_YUVTESTSRC_FILTER 1
%define CONFIG_NULLSINK_FILTER 1
%define CONFIG_ADRAWGRAPH_FILTER 1
%define CONFIG_AHISTOGRAM_FILTER 1
...
...
@@ -2005,6 +2012,7 @@
%define CONFIG_F4V_MUXER 1
%define CONFIG_FFM_MUXER 1
%define CONFIG_FFMETADATA_MUXER 1
%define CONFIG_FIFO_MUXER 0
%define CONFIG_FILMSTRIP_MUXER 1
%define CONFIG_FLAC_MUXER 1
%define CONFIG_FLV_MUXER 1
...
...
SMP/config.h
浏览文件 @
8d7ac27f
...
...
@@ -1825,6 +1825,7 @@
#define CONFIG_HWDOWNLOAD_FILTER 1
#define CONFIG_HWUPLOAD_FILTER 1
#define CONFIG_HWUPLOAD_CUDA_FILTER 0
#define CONFIG_HYSTERESIS_FILTER 1
#define CONFIG_IDET_FILTER 1
#define CONFIG_IL_FILTER 1
#define CONFIG_INFLATE_FILTER 1
...
...
@@ -1834,13 +1835,17 @@
#define CONFIG_LENSCORRECTION_FILTER 1
#define CONFIG_LOOP_FILTER 1
#define CONFIG_LUT_FILTER 1
#define CONFIG_LUT2_FILTER 1
#define CONFIG_LUT3D_FILTER 1
#define CONFIG_LUTRGB_FILTER 1
#define CONFIG_LUTYUV_FILTER 1
#define CONFIG_MASKEDCLAMP_FILTER 1
#define CONFIG_MASKEDMERGE_FILTER 1
#define CONFIG_MCDEINT_FILTER 1
#define CONFIG_MERGEPLANES_FILTER 1
#define CONFIG_MESTIMATE_FILTER 1
#define CONFIG_METADATA_FILTER 1
#define CONFIG_MINTERPOLATE_FILTER 1
#define CONFIG_MPDECIMATE_FILTER 1
#define CONFIG_NEGATE_FILTER 1
#define CONFIG_NNEDI_FILTER 1
...
...
@@ -1910,6 +1915,7 @@
#define CONFIG_TRIM_FILTER 1
#define CONFIG_UNSHARP_FILTER 1
#define CONFIG_USPP_FILTER 1
#define CONFIG_VAGUEDENOISER_FILTER 1
#define CONFIG_VECTORSCOPE_FILTER 1
#define CONFIG_VFLIP_FILTER 1
#define CONFIG_VIDSTABDETECT_FILTER 0
...
...
@@ -1938,6 +1944,7 @@
#define CONFIG_SMPTEHDBARS_FILTER 1
#define CONFIG_TESTSRC_FILTER 1
#define CONFIG_TESTSRC2_FILTER 1
#define CONFIG_YUVTESTSRC_FILTER 1
#define CONFIG_NULLSINK_FILTER 1
#define CONFIG_ADRAWGRAPH_FILTER 1
#define CONFIG_AHISTOGRAM_FILTER 1
...
...
@@ -2065,6 +2072,7 @@
#define CONFIG_F4V_MUXER 1
#define CONFIG_FFM_MUXER 1
#define CONFIG_FFMETADATA_MUXER 1
#define CONFIG_FIFO_MUXER 0
#define CONFIG_FILMSTRIP_MUXER 1
#define CONFIG_FLAC_MUXER 1
#define CONFIG_FLV_MUXER 1
...
...
SMP/libavcodec.vcxproj
浏览文件 @
8d7ac27f
...
...
@@ -302,6 +302,7 @@
<ClCompile
Include=
"..\libavcodec\aliaspixenc.c"
/>
<ClCompile
Include=
"..\libavcodec\alsdec.c"
/>
<ClCompile
Include=
"..\libavcodec\bgmc.c"
/>
<ClCompile
Include=
"..\libavcodec\mlz.c"
/>
<ClCompile
Include=
"..\libavcodec\amrnbdec.c"
/>
<ClCompile
Include=
"..\libavcodec\celp_filters.c"
/>
<ClCompile
Include=
"..\libavcodec\celp_math.c"
/>
...
...
SMP/libavcodec.vcxproj.filters
浏览文件 @
8d7ac27f
...
...
@@ -726,6 +726,9 @@
<ClCompile
Include=
"..\libavcodec\bgmc.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\mlz.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\amrnbdec.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
SMP/libavfilter.vcxproj
浏览文件 @
8d7ac27f
...
...
@@ -243,12 +243,18 @@
<ClCompile
Include=
"..\libavfilter\vf_hue.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_hwdownload.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_hwupload.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_hysteresis.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_il.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_kerndeint.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_lenscorrection.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_lut.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_lut2.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_maskedclamp.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_mcdeint.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_mergeplanes.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_mestimate.c"
/>
<ClCompile
Include=
"..\libavfilter\motion_estimation.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_minterpolate.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_mpdecimate.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_nnedi.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_noise.c"
/>
...
...
@@ -293,6 +299,7 @@
<ClCompile
Include=
"..\libavfilter\vf_transpose.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_unsharp.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_uspp.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_vaguedenoiser.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_vectorscope.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_vflip.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_vignette.c"
/>
...
...
SMP/libavfilter.vcxproj.filters
浏览文件 @
8d7ac27f
...
...
@@ -549,6 +549,9 @@
<ClCompile
Include=
"..\libavfilter\vf_hwupload.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_hysteresis.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_il.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -561,12 +564,27 @@
<ClCompile
Include=
"..\libavfilter\vf_lut.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_lut2.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_maskedclamp.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_mcdeint.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_mergeplanes.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_mestimate.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\motion_estimation.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_minterpolate.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_mpdecimate.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -699,6 +717,9 @@
<ClCompile
Include=
"..\libavfilter\vf_uspp.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_vaguedenoiser.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_vectorscope.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录