Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
8bb12d3e
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,发现更多精彩内容 >>
提交
8bb12d3e
编写于
8月 11, 2019
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
projects: Update for recent upstream merge.
上级
2c1806aa
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
48 addition
and
14 deletion
+48
-14
SMP/config.asm
SMP/config.asm
+2
-0
SMP/config.h
SMP/config.h
+2
-0
SMP/libavfilter.vcxproj
SMP/libavfilter.vcxproj
+9
-3
SMP/libavfilter.vcxproj.filters
SMP/libavfilter.vcxproj.filters
+25
-10
SMP/libavfilter/filter_list.c
SMP/libavfilter/filter_list.c
+1
-0
SMP/libavutil.vcxproj
SMP/libavutil.vcxproj
+2
-0
SMP/libavutil.vcxproj.filters
SMP/libavutil.vcxproj.filters
+6
-0
SMP/libavutil/ffversion.h
SMP/libavutil/ffversion.h
+1
-1
未找到文件。
SMP/config.asm
浏览文件 @
8bb12d3e
...
...
@@ -544,6 +544,7 @@
%define CONFIG_AUDIOTOOLBOX 0
%define CONFIG_CRYSTALHD 0
%define CONFIG_CUDA 1
%define CONFIG_CUDA_LLVM 0
%define CONFIG_CUVID 1
%define CONFIG_D3D11VA 1
%define CONFIG_DXVA2 1
...
...
@@ -1714,6 +1715,7 @@
%define CONFIG_SINC_FILTER 1
%define CONFIG_SINE_FILTER 1
%define CONFIG_ANULLSINK_FILTER 1
%define CONFIG_ADDROI_FILTER 1
%define CONFIG_ALPHAEXTRACT_FILTER 1
%define CONFIG_ALPHAMERGE_FILTER 1
%define CONFIG_AMPLIFY_FILTER 1
...
...
SMP/config.h
浏览文件 @
8bb12d3e
...
...
@@ -602,6 +602,7 @@
#define CONFIG_AUDIOTOOLBOX 0
#define CONFIG_CRYSTALHD 0
#define CONFIG_CUDA 1
#define CONFIG_CUDA_LLVM 0
#define CONFIG_CUVID 1
#if defined(NTDDI_WIN8)
# define CONFIG_D3D11VA 1
...
...
@@ -1836,6 +1837,7 @@
#define CONFIG_SINC_FILTER 1
#define CONFIG_SINE_FILTER 1
#define CONFIG_ANULLSINK_FILTER 1
#define CONFIG_ADDROI_FILTER 1
#define CONFIG_ALPHAEXTRACT_FILTER 1
#define CONFIG_ALPHAMERGE_FILTER 1
#define CONFIG_AMPLIFY_FILTER 1
...
...
SMP/libavfilter.vcxproj
浏览文件 @
8bb12d3e
...
...
@@ -66,6 +66,7 @@
<NASM
Include=
"..\libavfilter\x86\vf_blend.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_bwdif.asm"
/>
<NASM
Include=
"..\libavfilter\x86\colorspacedsp.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_convolution.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_framerate.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_fspp.asm"
/>
<NASM
Include=
"..\libavfilter\x86\vf_gblur.asm"
/>
...
...
@@ -109,8 +110,6 @@
<ClCompile
Include=
"..\libavfilter\video.c"
/>
<ClCompile
Include=
"..\libavfilter\pthread.c"
/>
<ClCompile
Include=
"..\libavfilter\qsvvpp.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn_interface.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn_backend_native.c"
/>
<ClCompile
Include=
"..\libavfilter\f_bench.c"
/>
<ClCompile
Include=
"..\libavfilter\af_sidechaincompress.c"
/>
<ClCompile
Include=
"..\libavfilter\af_acontrast.c"
/>
...
...
@@ -203,6 +202,7 @@
<ClCompile
Include=
"..\libavfilter\asrc_sinc.c"
/>
<ClCompile
Include=
"..\libavfilter\asrc_sine.c"
/>
<ClCompile
Include=
"..\libavfilter\asink_anullsink.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_addroi.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_extractplanes.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_alphamerge.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_amplify.c"
/>
...
...
@@ -229,7 +229,6 @@
<ClCompile
Include=
"..\libavfilter\vf_colormatrix.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_colorspace.c"
/>
<ClCompile
Include=
"..\libavfilter\colorspace.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_convolution.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_convolve.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_copy.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_cover_rect.c"
/>
...
...
@@ -391,12 +390,16 @@
<ClCompile
Include=
"..\libavfilter\avf_showwaves.c"
/>
<ClCompile
Include=
"..\libavfilter\vaf_spectrumsynth.c"
/>
<ClCompile
Include=
"..\libavfilter\src_movie.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_interface.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_backend_native.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_backend_native_layer_pad.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\scene_sad_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\af_afir_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\af_anlmdn_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_blend_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_bwdif_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\colorspacedsp_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_convolution_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_fspp_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_gblur_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\vf_gradfun_init.c"
/>
...
...
@@ -442,6 +445,9 @@
<ClCompile
Include=
"..\libavfilter\colorspacedsp.c"
>
<ObjectFileName>
$(IntDir)\libavfilter_colorspacedsp.obj
</ObjectFileName>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_convolution.c"
>
<ObjectFileName>
$(IntDir)\libavfilter_vf_convolution.obj
</ObjectFileName>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_framerate.c"
>
<ObjectFileName>
$(IntDir)\libavfilter_vf_framerate.obj
</ObjectFileName>
</ClCompile>
...
...
SMP/libavfilter.vcxproj.filters
浏览文件 @
8bb12d3e
...
...
@@ -19,9 +19,12 @@
<Filter
Include=
"Source Files\libavfilter"
>
<UniqueIdentifier>
{bf017c32-250d-47da-b7e6-d5a5091cb1e6}
</UniqueIdentifier>
</Filter>
<Filter
Include=
"Source Files\libavfilter\
x86
"
>
<Filter
Include=
"Source Files\libavfilter\
dnn
"
>
<UniqueIdentifier>
{fd9e10e9-18f6-437d-b5d7-17290540c8b8}
</UniqueIdentifier>
</Filter>
<Filter
Include=
"Source Files\libavfilter\x86"
>
<UniqueIdentifier>
{f026e68e-ff14-4bf4-8758-6384ac7bcfaf}
</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None
Include=
".\libavfilter.def"
>
...
...
@@ -52,6 +55,9 @@
<NASM
Include=
"..\libavfilter\x86\colorspacedsp.asm"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
</NASM>
<NASM
Include=
"..\libavfilter\x86\vf_convolution.asm"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
</NASM>
<NASM
Include=
"..\libavfilter\x86\vf_framerate.asm"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
</NASM>
...
...
@@ -177,12 +183,6 @@
<ClCompile
Include=
"..\libavfilter\qsvvpp.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\dnn_interface.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\dnn_backend_native.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\f_bench.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -459,6 +459,9 @@
<ClCompile
Include=
"..\libavfilter\asink_anullsink.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_addroi.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_extractplanes.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -537,9 +540,6 @@
<ClCompile
Include=
"..\libavfilter\colorspace.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_convolution.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_convolve.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -1023,6 +1023,15 @@
<ClCompile
Include=
"..\libavfilter\src_movie.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_interface.c"
>
<Filter>
Source Files\libavfilter\dnn
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_backend_native.c"
>
<Filter>
Source Files\libavfilter\dnn
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_backend_native_layer_pad.c"
>
<Filter>
Source Files\libavfilter\dnn
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\x86\scene_sad_init.c"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
</ClCompile>
...
...
@@ -1041,6 +1050,9 @@
<ClCompile
Include=
"..\libavfilter\x86\colorspacedsp_init.c"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\x86\vf_convolution_init.c"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\x86\vf_fspp_init.c"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
</ClCompile>
...
...
@@ -1134,6 +1146,9 @@
<ClCompile
Include=
"..\libavfilter\colorspacedsp.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_convolution.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_framerate.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
SMP/libavfilter/filter_list.c
浏览文件 @
8bb12d3e
...
...
@@ -127,6 +127,7 @@ static const AVFilter *filter_list[] = {
&
ff_asrc_sinc
,
&
ff_asrc_sine
,
&
ff_asink_anullsink
,
&
ff_vf_addroi
,
&
ff_vf_alphaextract
,
&
ff_vf_alphamerge
,
&
ff_vf_amplify
,
...
...
SMP/libavutil.vcxproj
浏览文件 @
8bb12d3e
...
...
@@ -134,6 +134,8 @@
<ClCompile
Include=
"..\libavutil\xtea.c"
/>
<ClCompile
Include=
"..\libavutil\tea.c"
/>
<ClCompile
Include=
"..\libavutil\tx.c"
/>
<ClCompile
Include=
"..\libavutil\tx_float.c"
/>
<ClCompile
Include=
"..\libavutil\tx_double.c"
/>
<ClCompile
Include=
"..\libavutil\hwcontext_cuda.c"
/>
<ClCompile
Include=
"..\libavutil\hwcontext_dxva2.c"
/>
<ClCompile
Include=
"..\libavutil\lzo.c"
/>
...
...
SMP/libavutil.vcxproj.filters
浏览文件 @
8bb12d3e
...
...
@@ -258,6 +258,12 @@
<ClCompile
Include=
"..\libavutil\tx.c"
>
<Filter>
Source Files\libavutil
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavutil\tx_float.c"
>
<Filter>
Source Files\libavutil
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavutil\tx_double.c"
>
<Filter>
Source Files\libavutil
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavutil\hwcontext_cuda.c"
>
<Filter>
Source Files\libavutil
</Filter>
</ClCompile>
...
...
SMP/libavutil/ffversion.h
浏览文件 @
8bb12d3e
...
...
@@ -21,5 +21,5 @@
#ifndef SMP_LIBAVUTIL_FFVERSION_H
#define SMP_LIBAVUTIL_FFVERSION_H
#define FFMPEG_VERSION "4.
1
.git"
#define FFMPEG_VERSION "4.
2
.git"
#endif
/* SMP_LIBAVUTIL_FFVERSION_H */
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录