Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
bbcedade
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,发现更多精彩内容 >>
提交
bbcedade
编写于
8月 19, 2012
作者:
A
Anton Khirnov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avconv: make the -passlogfile option per-stream.
上级
038c0b1e
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
6 deletion
+14
-6
Changelog
Changelog
+1
-1
avconv.c
avconv.c
+3
-1
avconv.h
avconv.h
+3
-1
avconv_opt.c
avconv_opt.c
+6
-2
doc/avconv.texi
doc/avconv.texi
+1
-1
未找到文件。
Changelog
浏览文件 @
bbcedade
...
...
@@ -43,7 +43,7 @@ version <next>:
- RTMPTE protocol support
- Canopus Lossless Codec decoder
- avconv -shortest option is now per-output file,
-pass
is
now per-output stream
-pass
and -passlogfile are
now per-output stream
- Ut Video encoder
...
...
avconv.c
浏览文件 @
bbcedade
...
...
@@ -183,6 +183,7 @@ void exit_program(int ret)
av_freep
(
&
output_streams
[
i
]
->
forced_keyframes
);
av_freep
(
&
output_streams
[
i
]
->
avfilter
);
av_freep
(
&
output_streams
[
i
]
->
logfile_prefix
);
av_freep
(
&
output_streams
[
i
]
->
filtered_frame
);
av_freep
(
&
output_streams
[
i
]);
}
...
...
@@ -1747,7 +1748,8 @@ static int transcode_init(void)
FILE
*
f
;
snprintf
(
logfilename
,
sizeof
(
logfilename
),
"%s-%d.log"
,
pass_logfilename_prefix
?
pass_logfilename_prefix
:
DEFAULT_PASS_LOGFILENAME_PREFIX
,
ost
->
logfile_prefix
?
ost
->
logfile_prefix
:
DEFAULT_PASS_LOGFILENAME_PREFIX
,
i
);
if
(
!
strcmp
(
ost
->
enc
->
name
,
"libx264"
))
{
av_dict_set
(
&
ost
->
opts
,
"stats"
,
logfilename
,
AV_DICT_DONT_OVERWRITE
);
...
...
avconv.h
浏览文件 @
bbcedade
...
...
@@ -160,6 +160,8 @@ typedef struct OptionsContext {
int
nb_filters
;
SpecifierOpt
*
pass
;
int
nb_pass
;
SpecifierOpt
*
passlogfiles
;
int
nb_passlogfiles
;
}
OptionsContext
;
typedef
struct
InputFilter
{
...
...
@@ -284,6 +286,7 @@ typedef struct OutputStream {
int
forced_kf_index
;
char
*
forced_keyframes
;
char
*
logfile_prefix
;
FILE
*
logfile
;
OutputFilter
*
filter
;
...
...
@@ -323,7 +326,6 @@ extern int nb_output_files;
extern
FilterGraph
**
filtergraphs
;
extern
int
nb_filtergraphs
;
extern
char
*
pass_logfilename_prefix
;
extern
char
*
vstats_filename
;
extern
float
audio_drift_threshold
;
...
...
avconv_opt.c
浏览文件 @
bbcedade
...
...
@@ -54,7 +54,6 @@
}\
}
char
*
pass_logfilename_prefix
=
NULL
;
char
*
vstats_filename
;
float
audio_drift_threshold
=
0
.
1
;
...
...
@@ -967,6 +966,11 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc)
}
}
MATCH_PER_STREAM_OPT
(
passlogfiles
,
str
,
ost
->
logfile_prefix
,
oc
,
st
);
if
(
ost
->
logfile_prefix
&&
!
(
ost
->
logfile_prefix
=
av_strdup
(
ost
->
logfile_prefix
)))
exit_program
(
1
);
MATCH_PER_STREAM_OPT
(
forced_key_frames
,
str
,
ost
->
forced_keyframes
,
oc
,
st
);
if
(
ost
->
forced_keyframes
)
ost
->
forced_keyframes
=
av_strdup
(
ost
->
forced_keyframes
);
...
...
@@ -1967,7 +1971,7 @@ const OptionDef options[] = {
"use same quantizer as source (implies VBR)"
},
{
"pass"
,
OPT_VIDEO
|
HAS_ARG
|
OPT_SPEC
|
OPT_INT
,
{
.
off
=
OFFSET
(
pass
)
},
"select the pass number (1 or 2)"
,
"n"
},
{
"passlogfile"
,
OPT_VIDEO
|
HAS_ARG
|
OPT_STRING
|
OPT_EXPERT
,
{
&
pass_logfilename_prefix
},
{
"passlogfile"
,
OPT_VIDEO
|
HAS_ARG
|
OPT_STRING
|
OPT_EXPERT
|
OPT_SPEC
,
{
.
off
=
OFFSET
(
passlogfiles
)
},
"select two pass log file name prefix"
,
"prefix"
},
{
"deinterlace"
,
OPT_VIDEO
|
OPT_EXPERT
,
{
.
func_arg
=
opt_deinterlace
},
"this option is deprecated, use the yadif filter instead"
},
...
...
doc/avconv.texi
浏览文件 @
bbcedade
...
...
@@ -492,7 +492,7 @@ avconv -i foo.mov -c:v libxvid -pass 1 -an -f rawvideo -y NUL
avconv -i foo.mov -c:v libxvid -pass 1 -an -f rawvideo -y /dev/null
@end example
@item -passlogfile
@var
{
prefix
}
(@emph
{
global
}
)
@item -passlogfile
[:@var
{
stream
_
specifier
}
] @var
{
prefix
}
(@emph
{
output,per-stream
}
)
Set two-pass log file name prefix to @var
{
prefix
}
, the default file name
prefix is ``av2pass''. The complete file name will be
@file
{
PREFIX-N.log
}
, where N is a number specific to the output
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录