Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
c9065c29
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,发现更多精彩内容 >>
提交
c9065c29
编写于
7月 28, 2011
作者:
A
Anton Khirnov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avconv: remove deprecated options.
上级
b9aac90b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
0 addition
and
67 deletion
+0
-67
avconv.c
avconv.c
+0
-52
doc/avconv.texi
doc/avconv.texi
+0
-15
未找到文件。
avconv.c
浏览文件 @
c9065c29
...
...
@@ -143,8 +143,6 @@ static int do_deinterlace = 0;
static
int
top_field_first
=
-
1
;
static
int
me_threshold
=
0
;
static
int
intra_dc_precision
=
8
;
static
int
loop_input
=
0
;
static
int
loop_output
=
AVFMT_NOOUTPUTLOOP
;
static
int
qp_hist
=
0
;
#if CONFIG_AVFILTER
static
char
*
vfilters
=
NULL
;
...
...
@@ -2889,20 +2887,6 @@ static int opt_audio_channels(const char *opt, const char *arg)
return
0
;
}
static
int
opt_video_channel
(
const
char
*
opt
,
const
char
*
arg
)
{
av_log
(
NULL
,
AV_LOG_WARNING
,
"This option is deprecated, use -channel.
\n
"
);
opt_default
(
"channel"
,
arg
);
return
0
;
}
static
int
opt_video_standard
(
const
char
*
opt
,
const
char
*
arg
)
{
av_log
(
NULL
,
AV_LOG_WARNING
,
"This option is deprecated, use -standard.
\n
"
);
opt_default
(
"standard"
,
arg
);
return
0
;
}
static
int
opt_codec
(
int
*
pstream_copy
,
char
**
pcodec_name
,
int
codec_type
,
const
char
*
arg
)
{
...
...
@@ -3028,13 +3012,6 @@ static int opt_map_metadata(const char *opt, const char *arg)
return
0
;
}
static
int
opt_map_meta_data
(
const
char
*
opt
,
const
char
*
arg
)
{
fprintf
(
stderr
,
"-map_meta_data is deprecated and will be removed soon. "
"Use -map_metadata instead.
\n
"
);
return
opt_map_metadata
(
opt
,
arg
);
}
static
int
opt_input_ts_scale
(
const
char
*
opt
,
const
char
*
arg
)
{
unsigned
int
stream
;
...
...
@@ -3063,19 +3040,6 @@ static int opt_start_time(const char *opt, const char *arg)
return
0
;
}
static
int
opt_recording_timestamp
(
const
char
*
opt
,
const
char
*
arg
)
{
char
buf
[
128
];
int64_t
recording_timestamp
=
parse_time_or_die
(
opt
,
arg
,
0
)
/
1E6
;
struct
tm
time
=
*
gmtime
((
time_t
*
)
&
recording_timestamp
);
strftime
(
buf
,
sizeof
(
buf
),
"creation_time=%FT%T%z"
,
&
time
);
opt_metadata
(
"metadata"
,
buf
);
av_log
(
NULL
,
AV_LOG_WARNING
,
"%s is deprecated, set the 'creation_time' metadata "
"tag instead.
\n
"
,
opt
);
return
0
;
}
static
int
opt_input_ts_offset
(
const
char
*
opt
,
const
char
*
arg
)
{
input_ts_offset
=
parse_time_or_die
(
opt
,
arg
,
1
);
...
...
@@ -3192,11 +3156,6 @@ static int opt_input_file(const char *opt, const char *filename)
opt_programid
=
0
;
}
if
(
loop_input
)
{
av_log
(
NULL
,
AV_LOG_WARNING
,
"-loop_input is deprecated, use -loop 1
\n
"
);
ic
->
loop_input
=
loop_input
;
}
/* Set AVCodecContext options for avformat_find_stream_info */
opts
=
setup_find_stream_info_opts
(
ic
,
codec_opts
);
orig_nb_streams
=
ic
->
nb_streams
;
...
...
@@ -3797,10 +3756,6 @@ static void opt_output_file(const char *filename)
oc
->
preload
=
(
int
)(
mux_preload
*
AV_TIME_BASE
);
oc
->
max_delay
=
(
int
)(
mux_max_delay
*
AV_TIME_BASE
);
if
(
loop_output
>=
0
)
{
av_log
(
NULL
,
AV_LOG_WARNING
,
"-loop_output is deprecated, use -loop
\n
"
);
oc
->
loop_output
=
loop_output
;
}
oc
->
flags
|=
AVFMT_FLAG_NONBLOCK
;
/* copy chapters */
...
...
@@ -4212,8 +4167,6 @@ static const OptionDef options[] = {
{
"i"
,
HAS_ARG
,
{(
void
*
)
opt_input_file
},
"input file name"
,
"filename"
},
{
"y"
,
OPT_BOOL
,
{(
void
*
)
&
file_overwrite
},
"overwrite output files"
},
{
"map"
,
HAS_ARG
|
OPT_EXPERT
,
{(
void
*
)
opt_map
},
"set input stream mapping"
,
"file.stream[:syncfile.syncstream]"
},
{
"map_meta_data"
,
HAS_ARG
|
OPT_EXPERT
,
{(
void
*
)
opt_map_meta_data
},
"DEPRECATED set meta data information of outfile from infile"
,
"outfile[,metadata]:infile[,metadata]"
},
{
"map_metadata"
,
HAS_ARG
|
OPT_EXPERT
,
{(
void
*
)
opt_map_metadata
},
"set metadata information of outfile from infile"
,
"outfile[,metadata]:infile[,metadata]"
},
{
"map_chapters"
,
OPT_INT
|
HAS_ARG
|
OPT_EXPERT
,
{(
void
*
)
&
chapters_input_file
},
"set chapters mapping"
,
"input_file_index"
},
...
...
@@ -4222,7 +4175,6 @@ static const OptionDef options[] = {
{
"ss"
,
HAS_ARG
,
{(
void
*
)
opt_start_time
},
"set the start time offset"
,
"time_off"
},
{
"itsoffset"
,
HAS_ARG
,
{(
void
*
)
opt_input_ts_offset
},
"set the input ts offset"
,
"time_off"
},
{
"itsscale"
,
HAS_ARG
,
{(
void
*
)
opt_input_ts_scale
},
"set the input ts scale"
,
"stream:scale"
},
{
"timestamp"
,
HAS_ARG
,
{(
void
*
)
opt_recording_timestamp
},
"set the recording timestamp ('now' to set the current time)"
,
"time"
},
{
"metadata"
,
HAS_ARG
,
{(
void
*
)
opt_metadata
},
"add metadata"
,
"string=string"
},
{
"dframes"
,
OPT_INT
|
HAS_ARG
,
{(
void
*
)
&
max_frames
[
AVMEDIA_TYPE_DATA
]},
"set the number of data frames to record"
,
"number"
},
{
"benchmark"
,
OPT_BOOL
|
OPT_EXPERT
,
{(
void
*
)
&
do_benchmark
},
...
...
@@ -4233,8 +4185,6 @@ static const OptionDef options[] = {
{
"hex"
,
OPT_BOOL
|
OPT_EXPERT
,
{(
void
*
)
&
do_hex_dump
},
"when dumping packets, also dump the payload"
},
{
"re"
,
OPT_BOOL
|
OPT_EXPERT
,
{(
void
*
)
&
rate_emu
},
"read input at native frame rate"
,
""
},
{
"loop_input"
,
OPT_BOOL
|
OPT_EXPERT
,
{(
void
*
)
&
loop_input
},
"deprecated, use -loop"
},
{
"loop_output"
,
HAS_ARG
|
OPT_INT
|
OPT_EXPERT
,
{(
void
*
)
&
loop_output
},
"deprecated, use -loop"
,
""
},
{
"v"
,
HAS_ARG
,
{(
void
*
)
opt_verbose
},
"set the verbosity level"
,
"number"
},
{
"target"
,
HAS_ARG
,
{(
void
*
)
opt_target
},
"specify target file type (
\"
vcd
\"
,
\"
svcd
\"
,
\"
dvd
\"
,
\"
dv
\"
,
\"
dv50
\"
,
\"
pal-vcd
\"
,
\"
ntsc-svcd
\"
, ...)"
,
"type"
},
{
"threads"
,
HAS_ARG
|
OPT_EXPERT
,
{(
void
*
)
opt_thread_count
},
"thread count"
,
"count"
},
...
...
@@ -4316,8 +4266,6 @@ static const OptionDef options[] = {
{
"stag"
,
HAS_ARG
|
OPT_EXPERT
|
OPT_SUBTITLE
,
{(
void
*
)
opt_codec_tag
},
"force subtitle tag/fourcc"
,
"fourcc/tag"
},
/* grab options */
{
"vc"
,
HAS_ARG
|
OPT_EXPERT
|
OPT_VIDEO
|
OPT_GRAB
,
{(
void
*
)
opt_video_channel
},
"deprecated, use -channel"
,
"channel"
},
{
"tvstd"
,
HAS_ARG
|
OPT_EXPERT
|
OPT_VIDEO
|
OPT_GRAB
,
{(
void
*
)
opt_video_standard
},
"deprecated, use -standard"
,
"standard"
},
{
"isync"
,
OPT_BOOL
|
OPT_EXPERT
|
OPT_GRAB
,
{(
void
*
)
&
input_sync
},
"sync read on input"
,
""
},
/* muxer options */
...
...
doc/avconv.texi
浏览文件 @
c9065c29
...
...
@@ -633,10 +633,6 @@ avconv -i file.mov -an -vn -sbsf mov2textsub -scodec copy -f rawvideo sub.txt
@section Audio/Video grab options
@table @option
@item -vc @var
{
channel
}
Set video grab channel (DV1394 only).
@item -tvstd @var
{
standard
}
Set television standard (NTSC, PAL (SECAM)).
@item -isync
Synchronize read on input.
@end table
...
...
@@ -681,9 +677,6 @@ avconv -i a.mov -i b.mov -vcodec copy -acodec copy out.mov -map 0.2 -map 1.6
To add more streams to the output file, you can use the
@code
{
-newaudio
}
, @code
{
-newvideo
}
, @code
{
-newsubtitle
}
options.
@item -map
_
meta
_
data @var
{
outfile
}
[,@var
{
metadata
}
]:@var
{
infile
}
[,@var
{
metadata
}
]
Deprecated, use @var
{
-map
_
metadata
}
instead.
@item -map
_
metadata @var
{
outfile
}
[,@var
{
metadata
}
]:@var
{
infile
}
[,@var
{
metadata
}
]
Set metadata information of @var
{
outfile
}
from @var
{
infile
}
. Note that those
are file indices (zero-based), not filenames.
...
...
@@ -725,14 +718,6 @@ Only use bit exact algorithms (for codec testing).
Set RTP payload size in bytes.
@item -re
Read input at native frame rate. Mainly used to simulate a grab device.
@item -loop
_
input
Loop over the input stream. Currently it works only for image
streams. This option is used for automatic AVserver testing.
This option is deprecated, use -loop.
@item -loop
_
output @var
{
number
_
of
_
times
}
Repeatedly loop output for formats that support looping such as animated GIF
(0 will loop the output infinitely).
This option is deprecated, use -loop.
@item -threads @var
{
count
}
Thread count.
@item -vsync @var
{
parameter
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录