Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
826cc58d
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,发现更多精彩内容 >>
提交
826cc58d
编写于
2月 10, 2019
作者:
C
Carl Eugen Hoyos
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lavf/img2dec: Split img2 and img2pipe options.
上级
21858b06
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
10 deletion
+16
-10
libavformat/img2dec.c
libavformat/img2dec.c
+16
-10
未找到文件。
libavformat/img2dec.c
浏览文件 @
826cc58d
...
...
@@ -564,29 +564,29 @@ static int img_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
#define OFFSET(x) offsetof(VideoDemuxData, x)
#define DEC AV_OPT_FLAG_DECODING_PARAM
#define COMMON_OPTIONS \
{ "framerate", "set the video framerate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, DEC }, \
{ "pixel_format", "set video pixel format", OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, \
{ "video_size", "set video size", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, 0, 0, DEC }, \
{ NULL },
#if CONFIG_IMAGE2_DEMUXER
const
AVOption
ff_img_options
[]
=
{
{
"framerate"
,
"set the video framerate"
,
OFFSET
(
framerate
),
AV_OPT_TYPE_VIDEO_RATE
,
{.
str
=
"25"
},
0
,
INT_MAX
,
DEC
},
{
"loop"
,
"force loop over input file sequence"
,
OFFSET
(
loop
),
AV_OPT_TYPE_BOOL
,
{.
i64
=
0
},
0
,
1
,
DEC
},
{
"pattern_type"
,
"set pattern type"
,
OFFSET
(
pattern_type
),
AV_OPT_TYPE_INT
,
{.
i64
=
PT_DEFAULT
},
0
,
INT_MAX
,
DEC
,
"pattern_type"
},
{
"glob_sequence"
,
"select glob/sequence pattern type"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
PT_GLOB_SEQUENCE
},
INT_MIN
,
INT_MAX
,
DEC
,
"pattern_type"
},
{
"glob"
,
"select glob pattern type"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
PT_GLOB
},
INT_MIN
,
INT_MAX
,
DEC
,
"pattern_type"
},
{
"sequence"
,
"select sequence pattern type"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
PT_SEQUENCE
},
INT_MIN
,
INT_MAX
,
DEC
,
"pattern_type"
},
{
"none"
,
"disable pattern matching"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
PT_NONE
},
INT_MIN
,
INT_MAX
,
DEC
,
"pattern_type"
},
{
"pixel_format"
,
"set video pixel format"
,
OFFSET
(
pixel_format
),
AV_OPT_TYPE_STRING
,
{.
str
=
NULL
},
0
,
0
,
DEC
},
{
"start_number"
,
"set first number in the sequence"
,
OFFSET
(
start_number
),
AV_OPT_TYPE_INT
,
{.
i64
=
0
},
INT_MIN
,
INT_MAX
,
DEC
},
{
"start_number_range"
,
"set range for looking at the first sequence number"
,
OFFSET
(
start_number_range
),
AV_OPT_TYPE_INT
,
{.
i64
=
5
},
1
,
INT_MAX
,
DEC
},
{
"video_size"
,
"set video size"
,
OFFSET
(
width
),
AV_OPT_TYPE_IMAGE_SIZE
,
{.
str
=
NULL
},
0
,
0
,
DEC
},
{
"frame_size"
,
"force frame size in bytes"
,
OFFSET
(
frame_size
),
AV_OPT_TYPE_INT
,
{.
i64
=
0
},
0
,
INT_MAX
,
DEC
},
{
"ts_from_file"
,
"set frame timestamp from file's one"
,
OFFSET
(
ts_from_file
),
AV_OPT_TYPE_INT
,
{.
i64
=
0
},
0
,
2
,
DEC
,
"ts_type"
},
{
"none"
,
"none"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
0
},
0
,
2
,
DEC
,
"ts_type"
},
{
"sec"
,
"second precision"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
1
},
0
,
2
,
DEC
,
"ts_type"
},
{
"ns"
,
"nano second precision"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
2
},
0
,
2
,
DEC
,
"ts_type"
},
{
NULL
},
COMMON_OPTIONS
};
#if CONFIG_IMAGE2_DEMUXER
static
const
AVClass
img2_class
=
{
.
class_name
=
"image2 demuxer"
,
.
item_name
=
av_default_item_name
,
...
...
@@ -606,11 +606,17 @@ AVInputFormat ff_image2_demuxer = {
.
priv_class
=
&
img2_class
,
};
#endif
const
AVOption
ff_img2pipe_options
[]
=
{
{
"frame_size"
,
"force frame size in bytes"
,
OFFSET
(
frame_size
),
AV_OPT_TYPE_INT
,
{.
i64
=
0
},
0
,
INT_MAX
,
DEC
},
COMMON_OPTIONS
};
#if CONFIG_IMAGE2PIPE_DEMUXER
static
const
AVClass
img2pipe_class
=
{
.
class_name
=
"image2pipe demuxer"
,
.
item_name
=
av_default_item_name
,
.
option
=
ff_img_options
,
.
option
=
ff_img
2pipe
_options
,
.
version
=
LIBAVUTIL_VERSION_INT
,
};
AVInputFormat
ff_image2pipe_demuxer
=
{
...
...
@@ -1023,7 +1029,7 @@ static int gif_probe(AVProbeData *p)
static const AVClass imgname ## _class = {\
.class_name = AV_STRINGIFY(imgname) " demuxer",\
.item_name = av_default_item_name,\
.option = ff_img_options,\
.option = ff_img
2pipe
_options,\
.version = LIBAVUTIL_VERSION_INT,\
};\
AVInputFormat ff_image_ ## imgname ## _pipe_demuxer = {\
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录