Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
c0f2abcc
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,发现更多精彩内容 >>
提交
c0f2abcc
编写于
4月 29, 2018
作者:
P
Paul B Mahol
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avfilter/vf_mix: make setting weights more user friendly
Signed-off-by:
N
Paul B Mahol
<
onemda@gmail.com
>
上级
6e95d80e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
3 deletion
+12
-3
doc/filters.texi
doc/filters.texi
+6
-2
libavfilter/vf_mix.c
libavfilter/vf_mix.c
+6
-1
未找到文件。
doc/filters.texi
浏览文件 @
c0f2abcc
...
...
@@ -11177,7 +11177,9 @@ The number of inputs. If unspecified, it defaults to 2.
@item weights
Specify weight of each input video stream as sequence.
Each weight is separated by space.
Each weight is separated by space. If number of weights
is smaller than number of @var{frames} last specified
weight will be used for all remaining unset weights.
@item scale
Specify scale, if it is set it will be multiplied with sum
...
...
@@ -15603,7 +15605,9 @@ The number of successive frames to mix. If unspecified, it defaults to 3.
@item weights
Specify weight of each input video frame.
Each weight is separated by space.
Each weight is separated by space. If number of weights is smaller than
number of @var{frames} last specified weight will be used for all remaining
unset weights.
@item scale
Specify scale, if it is set it will be multiplied with sum
...
...
libavfilter/vf_mix.c
浏览文件 @
c0f2abcc
...
...
@@ -74,7 +74,7 @@ static av_cold int init(AVFilterContext *ctx)
{
MixContext
*
s
=
ctx
->
priv
;
char
*
p
,
*
arg
,
*
saveptr
=
NULL
;
int
i
,
ret
;
int
i
,
ret
,
last
;
s
->
tmix
=
!
strcmp
(
ctx
->
filter
->
name
,
"tmix"
);
...
...
@@ -110,6 +110,11 @@ static av_cold int init(AVFilterContext *ctx)
p
=
NULL
;
sscanf
(
arg
,
"%f"
,
&
s
->
weights
[
i
]);
s
->
wfactor
+=
s
->
weights
[
i
];
last
=
i
;
}
for
(;
i
<
s
->
nb_inputs
;
i
++
)
{
s
->
weights
[
i
]
=
s
->
weights
[
last
];
s
->
wfactor
+=
s
->
weights
[
i
];
}
if
(
s
->
scale
==
0
)
{
s
->
wfactor
=
1
/
s
->
wfactor
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录