Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
f919964b
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,发现更多精彩内容 >>
提交
f919964b
编写于
1月 10, 2021
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
projects: Update for upstream merge.
上级
04d07572
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
37 addition
and
1 deletion
+37
-1
SMP/config.asm
SMP/config.asm
+3
-0
SMP/config.h
SMP/config.h
+4
-1
SMP/libavcodec.vcxproj
SMP/libavcodec.vcxproj
+2
-0
SMP/libavcodec.vcxproj.filters
SMP/libavcodec.vcxproj.filters
+6
-0
SMP/libavfilter.vcxproj
SMP/libavfilter.vcxproj
+5
-0
SMP/libavfilter.vcxproj.filters
SMP/libavfilter.vcxproj.filters
+15
-0
SMP/libavfilter/filter_list.c
SMP/libavfilter/filter_list.c
+2
-0
未找到文件。
SMP/config.asm
浏览文件 @
f919964b
...
...
@@ -238,6 +238,7 @@
%define HAVE_ES2_GL_H 0
%define HAVE_GSM_H 0
%define HAVE_IO_H 1
%define HAVE_LINUX_DMA_BUF_H 0
%define HAVE_LINUX_PERF_EVENT_H 0
%define HAVE_MACHINE_IOCTL_BT848_H 0
%define HAVE_MACHINE_IOCTL_METEOR_H 0
...
...
@@ -2035,6 +2036,7 @@
%define CONFIG_SHOWINFO_FILTER 1
%define CONFIG_SHOWPALETTE_FILTER 1
%define CONFIG_SHUFFLEFRAMES_FILTER 1
%define CONFIG_SHUFFLEPIXELS_FILTER 1
%define CONFIG_SHUFFLEPLANES_FILTER 1
%define CONFIG_SIDEDATA_FILTER 1
%define CONFIG_SIGNALSTATS_FILTER 1
...
...
@@ -2062,6 +2064,7 @@
%define CONFIG_TINTERLACE_FILTER 1
%define CONFIG_TLUT2_FILTER 1
%define CONFIG_TMEDIAN_FILTER 1
%define CONFIG_TMIDEQUALIZER_FILTER 1
%define CONFIG_TMIX_FILTER 1
%define CONFIG_TONEMAP_FILTER 1
%define CONFIG_TONEMAP_OPENCL_FILTER 0
...
...
SMP/config.h
浏览文件 @
f919964b
...
...
@@ -27,7 +27,7 @@
#endif
#define FFMPEG_CONFIGURATION "--enable-gpl --enable-version3 --enable-bzlib --enable-iconv --enable-lzma --enable-sdl2 --enable-zlib --enable-libmp3lame --enable-libvorbis --enable-libspeex --enable-libopus --enable-libilbc --enable-libtheora --enable-libx264 --enable-libx265 --enable-libxvid --enable-libvpx --enable-libgme --enable-libmodplug --enable-libsoxr --enable-libfreetype --enable-fontconfig --enable-libfribidi --enable-libass --enable-libxml2 --enable-gnutls --disable-schannel --enable-gcrypt --enable-libssh --enable-libcdio --enable-libbluray --enable-opengl --enable-libmfx --enable-ffnvcodec --enable-cuda --enable-amf --toolchain=msvc"
#define FFMPEG_LICENSE "GPL version 3 or later"
#define CONFIG_THIS_YEAR 202
0
#define CONFIG_THIS_YEAR 202
1
#define FFMPEG_DATADIR "."
#define AVCONV_DATADIR "."
#if defined(__INTEL_COMPILER)
...
...
@@ -280,6 +280,7 @@
#define HAVE_ES2_GL_H 0
#define HAVE_GSM_H 0
#define HAVE_IO_H 1
#define HAVE_LINUX_DMA_BUF_H 0
#define HAVE_LINUX_PERF_EVENT_H 0
#define HAVE_MACHINE_IOCTL_BT848_H 0
#define HAVE_MACHINE_IOCTL_METEOR_H 0
...
...
@@ -2157,6 +2158,7 @@
#define CONFIG_SHOWINFO_FILTER 1
#define CONFIG_SHOWPALETTE_FILTER 1
#define CONFIG_SHUFFLEFRAMES_FILTER 1
#define CONFIG_SHUFFLEPIXELS_FILTER 1
#define CONFIG_SHUFFLEPLANES_FILTER 1
#define CONFIG_SIDEDATA_FILTER 1
#define CONFIG_SIGNALSTATS_FILTER 1
...
...
@@ -2184,6 +2186,7 @@
#define CONFIG_TINTERLACE_FILTER 1
#define CONFIG_TLUT2_FILTER 1
#define CONFIG_TMEDIAN_FILTER 1
#define CONFIG_TMIDEQUALIZER_FILTER 1
#define CONFIG_TMIX_FILTER 1
#define CONFIG_TONEMAP_FILTER 1
#define CONFIG_TONEMAP_OPENCL_FILTER 0
...
...
SMP/libavcodec.vcxproj
浏览文件 @
f919964b
...
...
@@ -290,6 +290,7 @@
<ClCompile
Include=
"..\libavcodec\aacdec.c"
/>
<ClCompile
Include=
"..\libavcodec\aactab.c"
/>
<ClCompile
Include=
"..\libavcodec\aacsbr.c"
/>
<ClCompile
Include=
"..\libavcodec\aacps_common.c"
/>
<ClCompile
Include=
"..\libavcodec\aacps_float.c"
/>
<ClCompile
Include=
"..\libavcodec\kbdwin.c"
/>
<ClCompile
Include=
"..\libavcodec\aacpsdsp_float.c"
/>
...
...
@@ -826,6 +827,7 @@
<ClCompile
Include=
"..\libavcodec\qsvenc_vp9.c"
/>
<ClCompile
Include=
"..\libavcodec\vqavideo.c"
/>
<ClCompile
Include=
"..\libavcodec\wavpack.c"
/>
<ClCompile
Include=
"..\libavcodec\wavpackdata.c"
/>
<ClCompile
Include=
"..\libavcodec\wavpackenc.c"
/>
<ClCompile
Include=
"..\libavcodec\wcmv.c"
/>
<ClCompile
Include=
"..\libavcodec\webp.c"
/>
...
...
SMP/libavcodec.vcxproj.filters
浏览文件 @
f919964b
...
...
@@ -720,6 +720,9 @@
<ClCompile
Include=
"..\libavcodec\aacsbr.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\aacps_common.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\aacps_float.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
@@ -2328,6 +2331,9 @@
<ClCompile
Include=
"..\libavcodec\wavpack.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\wavpackdata.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\wavpackenc.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
SMP/libavfilter.vcxproj
浏览文件 @
f919964b
...
...
@@ -238,6 +238,7 @@
<ClCompile
Include=
"..\libavfilter\vf_chromashift.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_ciescope.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_codecview.c"
/>
<ClCompile
Include=
"..\libavfilter\qp_table.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_colorbalance.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_colorchannelmixer.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_colorkey.c"
/>
...
...
@@ -366,6 +367,7 @@
<ClCompile
Include=
"..\libavfilter\vf_showinfo.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_showpalette.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_shuffleframes.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_shufflepixels.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_shuffleplanes.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_signalstats.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_signature.c"
/>
...
...
@@ -379,6 +381,7 @@
<ClCompile
Include=
"..\libavfilter\vf_thumbnail.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_tile.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_xmedian.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_tmidequalizer.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_tonemap.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_tpad.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_unsharp.c"
/>
...
...
@@ -419,6 +422,8 @@
<ClCompile
Include=
"..\libavfilter\src_movie.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_interface.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_io_proc.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn\queue.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn\safe_queue.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_backend_native.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_backend_native_layers.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_backend_native_layer_avgpool.c"
/>
...
...
SMP/libavfilter.vcxproj.filters
浏览文件 @
f919964b
...
...
@@ -567,6 +567,9 @@
<ClCompile
Include=
"..\libavfilter\vf_codecview.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\qp_table.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_colorbalance.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -951,6 +954,9 @@
<ClCompile
Include=
"..\libavfilter\vf_shuffleframes.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_shufflepixels.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_shuffleplanes.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -990,6 +996,9 @@
<ClCompile
Include=
"..\libavfilter\vf_xmedian.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_tmidequalizer.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_tonemap.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -1110,6 +1119,12 @@
<ClCompile
Include=
"..\libavfilter\dnn\dnn_io_proc.c"
>
<Filter>
Source Files\libavfilter\dnn
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\dnn\queue.c"
>
<Filter>
Source Files\libavfilter\dnn
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\dnn\safe_queue.c"
>
<Filter>
Source Files\libavfilter\dnn
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_backend_native.c"
>
<Filter>
Source Files\libavfilter\dnn
</Filter>
</ClCompile>
...
...
SMP/libavfilter/filter_list.c
浏览文件 @
f919964b
...
...
@@ -338,6 +338,7 @@ static const AVFilter *filter_list[] = {
&
ff_vf_showinfo
,
&
ff_vf_showpalette
,
&
ff_vf_shuffleframes
,
&
ff_vf_shufflepixels
,
&
ff_vf_shuffleplanes
,
&
ff_vf_sidedata
,
&
ff_vf_signalstats
,
...
...
@@ -363,6 +364,7 @@ static const AVFilter *filter_list[] = {
&
ff_vf_tinterlace
,
&
ff_vf_tlut2
,
&
ff_vf_tmedian
,
&
ff_vf_tmidequalizer
,
&
ff_vf_tmix
,
&
ff_vf_tonemap
,
&
ff_vf_tpad
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录