Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
5e55240f
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,体验更适合开发者的 AI 搜索 >>
提交
5e55240f
编写于
9月 11, 2016
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
projects: Update for recent upstream merge.
上级
06729d08
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
40 addition
and
8 deletion
+40
-8
SMP/config.asm
SMP/config.asm
+12
-0
SMP/config.h
SMP/config.h
+12
-0
SMP/libavfilter.vcxproj
SMP/libavfilter.vcxproj
+4
-2
SMP/libavfilter.vcxproj.filters
SMP/libavfilter.vcxproj.filters
+12
-6
未找到文件。
SMP/config.asm
浏览文件 @
5e55240f
...
...
@@ -1146,8 +1146,13 @@
%define CONFIG_XBIN_DECODER 1
%define CONFIG_IDF_DECODER 1
%define CONFIG_LIBOPENH264_DECODER 0
%define CONFIG_H263_CUVID_DECODER 0
%define CONFIG_H264_CUVID_DECODER 0
%define CONFIG_HEVC_CUVID_DECODER 0
%define CONFIG_MJPEG_CUVID_DECODER 0
%define CONFIG_MPEG1_CUVID_DECODER 0
%define CONFIG_MPEG2_CUVID_DECODER 0
%define CONFIG_MPEG4_CUVID_DECODER 0
%define CONFIG_VC1_CUVID_DECODER 0
%define CONFIG_VP8_CUVID_DECODER 0
%define CONFIG_VP9_CUVID_DECODER 0
...
...
@@ -1705,6 +1710,7 @@
%define CONFIG_ALPHAMERGE_FILTER 1
%define CONFIG_ASS_FILTER 1
%define CONFIG_ATADENOISE_FILTER 1
%define CONFIG_AVGBLUR_FILTER 1
%define CONFIG_BBOX_FILTER 1
%define CONFIG_BENCH_FILTER 1
%define CONFIG_BITPLANENOISE_FILTER 1
...
...
@@ -1763,6 +1769,7 @@
%define CONFIG_FRAMESTEP_FILTER 1
%define CONFIG_FREI0R_FILTER 0
%define CONFIG_FSPP_FILTER 1
%define CONFIG_GBLUR_FILTER 1
%define CONFIG_GEQ_FILTER 1
%define CONFIG_GRADFUN_FILTER 1
%define CONFIG_HALDCLUT_FILTER 1
...
...
@@ -1913,6 +1920,7 @@
%define CONFIG_SPECTRUMSYNTH_FILTER 1
%define CONFIG_AMOVIE_FILTER 1
%define CONFIG_MOVIE_FILTER 1
%define CONFIG_H263_CUVID_HWACCEL 0
%define CONFIG_H263_VAAPI_HWACCEL 0
%define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
%define CONFIG_H264_CUVID_HWACCEL 0
...
...
@@ -1932,9 +1940,12 @@
%define CONFIG_HEVC_QSV_HWACCEL 1
%define CONFIG_HEVC_VAAPI_HWACCEL 0
%define CONFIG_HEVC_VDPAU_HWACCEL 0
%define CONFIG_MJPEG_CUVID_HWACCEL 0
%define CONFIG_MPEG1_CUVID_HWACCEL 0
%define CONFIG_MPEG1_XVMC_HWACCEL 0
%define CONFIG_MPEG1_VDPAU_HWACCEL 0
%define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
%define CONFIG_MPEG2_CUVID_HWACCEL 0
%define CONFIG_MPEG2_XVMC_HWACCEL 0
%define CONFIG_MPEG2_D3D11VA_HWACCEL 1
%define CONFIG_MPEG2_DXVA2_HWACCEL 1
...
...
@@ -1943,6 +1954,7 @@
%define CONFIG_MPEG2_VAAPI_HWACCEL 0
%define CONFIG_MPEG2_VDPAU_HWACCEL 0
%define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
%define CONFIG_MPEG4_CUVID_HWACCEL 0
%define CONFIG_MPEG4_MMAL_HWACCEL 0
%define CONFIG_MPEG4_VAAPI_HWACCEL 0
%define CONFIG_MPEG4_VDPAU_HWACCEL 0
...
...
SMP/config.h
浏览文件 @
5e55240f
...
...
@@ -1196,8 +1196,13 @@
#define CONFIG_XBIN_DECODER 1
#define CONFIG_IDF_DECODER 1
#define CONFIG_LIBOPENH264_DECODER 0
#define CONFIG_H263_CUVID_DECODER 0
#define CONFIG_H264_CUVID_DECODER 0
#define CONFIG_HEVC_CUVID_DECODER 0
#define CONFIG_MJPEG_CUVID_DECODER 0
#define CONFIG_MPEG1_CUVID_DECODER 0
#define CONFIG_MPEG2_CUVID_DECODER 0
#define CONFIG_MPEG4_CUVID_DECODER 0
#define CONFIG_VC1_CUVID_DECODER 0
#define CONFIG_VP8_CUVID_DECODER 0
#define CONFIG_VP9_CUVID_DECODER 0
...
...
@@ -1755,6 +1760,7 @@
#define CONFIG_ALPHAMERGE_FILTER 1
#define CONFIG_ASS_FILTER 1
#define CONFIG_ATADENOISE_FILTER 1
#define CONFIG_AVGBLUR_FILTER 1
#define CONFIG_BBOX_FILTER 1
#define CONFIG_BENCH_FILTER 1
#define CONFIG_BITPLANENOISE_FILTER 1
...
...
@@ -1813,6 +1819,7 @@
#define CONFIG_FRAMESTEP_FILTER 1
#define CONFIG_FREI0R_FILTER 0
#define CONFIG_FSPP_FILTER 1
#define CONFIG_GBLUR_FILTER 1
#define CONFIG_GEQ_FILTER 1
#define CONFIG_GRADFUN_FILTER 1
#define CONFIG_HALDCLUT_FILTER 1
...
...
@@ -1963,6 +1970,7 @@
#define CONFIG_SPECTRUMSYNTH_FILTER 1
#define CONFIG_AMOVIE_FILTER 1
#define CONFIG_MOVIE_FILTER 1
#define CONFIG_H263_CUVID_HWACCEL 0
#define CONFIG_H263_VAAPI_HWACCEL 0
#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
#define CONFIG_H264_CUVID_HWACCEL 0
...
...
@@ -1982,9 +1990,12 @@
#define CONFIG_HEVC_QSV_HWACCEL 1
#define CONFIG_HEVC_VAAPI_HWACCEL 0
#define CONFIG_HEVC_VDPAU_HWACCEL 0
#define CONFIG_MJPEG_CUVID_HWACCEL 0
#define CONFIG_MPEG1_CUVID_HWACCEL 0
#define CONFIG_MPEG1_XVMC_HWACCEL 0
#define CONFIG_MPEG1_VDPAU_HWACCEL 0
#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
#define CONFIG_MPEG2_CUVID_HWACCEL 0
#define CONFIG_MPEG2_XVMC_HWACCEL 0
#define CONFIG_MPEG2_D3D11VA_HWACCEL 1
#define CONFIG_MPEG2_DXVA2_HWACCEL 1
...
...
@@ -1993,6 +2004,7 @@
#define CONFIG_MPEG2_VAAPI_HWACCEL 0
#define CONFIG_MPEG2_VDPAU_HWACCEL 0
#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
#define CONFIG_MPEG4_CUVID_HWACCEL 0
#define CONFIG_MPEG4_MMAL_HWACCEL 0
#define CONFIG_MPEG4_VAAPI_HWACCEL 0
#define CONFIG_MPEG4_VDPAU_HWACCEL 0
...
...
SMP/libavfilter.vcxproj
浏览文件 @
5e55240f
...
...
@@ -174,13 +174,14 @@
<ClCompile
Include=
"..\libavfilter\af_vibrato.c"
/>
<ClCompile
Include=
"..\libavfilter\af_volumedetect.c"
/>
<ClCompile
Include=
"..\libavfilter\asrc_anoisesrc.c"
/>
<ClCompile
Include=
"..\libavfilter\asrc_anullsrc.c"
/>
<ClCompile
Include=
"..\libavfilter\asrc_sine.c"
/>
<ClCompile
Include=
"..\libavfilter\asink_anullsink.c"
/>
<ClCompile
Include=
"..\libavfilter\asrc_anullsrc.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_extractplanes.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_alphamerge.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_subtitles.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_atadenoise.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_avgblur.c"
/>
<ClCompile
Include=
"..\libavfilter\bbox.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_bbox.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_bitplanenoise.c"
/>
...
...
@@ -233,6 +234,7 @@
<ClCompile
Include=
"..\libavfilter\vf_framepack.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_framerate.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_framestep.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_gblur.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_geq.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_lut3d.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_hflip.c"
/>
...
...
@@ -309,10 +311,10 @@
<ClCompile
Include=
"..\libavfilter\vf_zoompan.c"
/>
<ClCompile
Include=
"..\libavfilter\vsrc_testsrc.c"
/>
<ClCompile
Include=
"..\libavfilter\vsrc_cellauto.c"
/>
<ClCompile
Include=
"..\libavfilter\vsink_nullsink.c"
/>
<ClCompile
Include=
"..\libavfilter\vsrc_life.c"
/>
<ClCompile
Include=
"..\libavfilter\vsrc_mandelbrot.c"
/>
<ClCompile
Include=
"..\libavfilter\vsrc_mptestsrc.c"
/>
<ClCompile
Include=
"..\libavfilter\vsink_nullsink.c"
/>
<ClCompile
Include=
"..\libavfilter\avf_ahistogram.c"
/>
<ClCompile
Include=
"..\libavfilter\avf_aphasemeter.c"
/>
<ClCompile
Include=
"..\libavfilter\avf_avectorscope.c"
/>
...
...
SMP/libavfilter.vcxproj.filters
浏览文件 @
5e55240f
...
...
@@ -342,13 +342,13 @@
<ClCompile
Include=
"..\libavfilter\asrc_anoisesrc.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\asrc_
sine
.c"
>
<ClCompile
Include=
"..\libavfilter\asrc_
anullsrc
.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\as
ink_anullsink
.c"
>
<ClCompile
Include=
"..\libavfilter\as
rc_sine
.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\as
rc_anullsrc
.c"
>
<ClCompile
Include=
"..\libavfilter\as
ink_anullsink
.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_extractplanes.c"
>
...
...
@@ -363,6 +363,9 @@
<ClCompile
Include=
"..\libavfilter\vf_atadenoise.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_avgblur.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\bbox.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -519,6 +522,9 @@
<ClCompile
Include=
"..\libavfilter\vf_framestep.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_gblur.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_geq.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -747,9 +753,6 @@
<ClCompile
Include=
"..\libavfilter\vsrc_cellauto.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vsink_nullsink.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vsrc_life.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -759,6 +762,9 @@
<ClCompile
Include=
"..\libavfilter\vsrc_mptestsrc.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vsink_nullsink.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\avf_ahistogram.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录