Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
fd2c0a5d
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,发现更多精彩内容 >>
提交
fd2c0a5d
编写于
6月 19, 2011
作者:
M
Mina Nagy Zaki
提交者:
Stefano Sabatini
6月 19, 2011
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lavfi: add layout negotiation fields and helper functions.
上级
527ca398
变更
29
隐藏空白更改
内联
并排
Showing
29 changed file
with
129 addition
and
67 deletion
+129
-67
doc/APIchanges
doc/APIchanges
+9
-0
ffplay.c
ffplay.c
+1
-1
libavfilter/avfilter.c
libavfilter/avfilter.c
+3
-0
libavfilter/avfilter.h
libavfilter/avfilter.h
+23
-11
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.c
+8
-1
libavfilter/defaults.c
libavfilter/defaults.c
+40
-31
libavfilter/formats.c
libavfilter/formats.c
+22
-0
libavfilter/vf_blackframe.c
libavfilter/vf_blackframe.c
+1
-1
libavfilter/vf_crop.c
libavfilter/vf_crop.c
+1
-1
libavfilter/vf_cropdetect.c
libavfilter/vf_cropdetect.c
+1
-1
libavfilter/vf_drawbox.c
libavfilter/vf_drawbox.c
+1
-1
libavfilter/vf_drawtext.c
libavfilter/vf_drawtext.c
+1
-1
libavfilter/vf_fade.c
libavfilter/vf_fade.c
+1
-1
libavfilter/vf_format.c
libavfilter/vf_format.c
+2
-2
libavfilter/vf_frei0r.c
libavfilter/vf_frei0r.c
+1
-1
libavfilter/vf_gradfun.c
libavfilter/vf_gradfun.c
+1
-1
libavfilter/vf_hflip.c
libavfilter/vf_hflip.c
+1
-1
libavfilter/vf_hqdn3d.c
libavfilter/vf_hqdn3d.c
+1
-1
libavfilter/vf_libopencv.c
libavfilter/vf_libopencv.c
+1
-1
libavfilter/vf_lut.c
libavfilter/vf_lut.c
+1
-1
libavfilter/vf_mp.c
libavfilter/vf_mp.c
+1
-1
libavfilter/vf_pad.c
libavfilter/vf_pad.c
+1
-1
libavfilter/vf_transpose.c
libavfilter/vf_transpose.c
+1
-1
libavfilter/vf_unsharp.c
libavfilter/vf_unsharp.c
+1
-1
libavfilter/vf_yadif.c
libavfilter/vf_yadif.c
+1
-1
libavfilter/vsink_buffer.c
libavfilter/vsink_buffer.c
+1
-1
libavfilter/vsrc_buffer.c
libavfilter/vsrc_buffer.c
+1
-1
libavfilter/vsrc_color.c
libavfilter/vsrc_color.c
+1
-1
libavfilter/vsrc_movie.c
libavfilter/vsrc_movie.c
+1
-1
未找到文件。
doc/APIchanges
浏览文件 @
fd2c0a5d
...
...
@@ -13,6 +13,15 @@ libavutil: 2011-04-18
API changes, most recent first:
2011-06-19 - xxxxxxx - lavfi 2.23.0 - avfilter.h
Add layout negotiation fields and helper functions.
In particular, add in_chlayouts and out_chlayouts to AVFilterLink,
and the functions:
avfilter_set_common_sample_formats()
avfilter_set_common_channel_layouts()
avfilter_all_channel_layouts()
2011-06-19 - xxxxxxx - lavfi 2.22.0 - AVFilterFormats
Change type of AVFilterFormats.formats from int * to int64_t *,
and update formats handling API accordingly.
...
...
ffplay.c
浏览文件 @
fd2c0a5d
...
...
@@ -1644,7 +1644,7 @@ static int input_query_formats(AVFilterContext *ctx)
priv
->
is
->
video_st
->
codec
->
pix_fmt
,
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/avfilter.c
浏览文件 @
fd2c0a5d
...
...
@@ -217,6 +217,9 @@ int avfilter_insert_filter(AVFilterLink *link, AVFilterContext *filt,
if
(
link
->
out_formats
)
avfilter_formats_changeref
(
&
link
->
out_formats
,
&
filt
->
outputs
[
filt_dstpad_idx
]
->
out_formats
);
if
(
link
->
out_chlayouts
)
avfilter_formats_changeref
(
&
link
->
out_chlayouts
,
&
filt
->
outputs
[
filt_dstpad_idx
]
->
out_chlayouts
);
return
0
;
}
...
...
libavfilter/avfilter.h
浏览文件 @
fd2c0a5d
...
...
@@ -26,7 +26,7 @@
#include "libavutil/samplefmt.h"
#define LIBAVFILTER_VERSION_MAJOR 2
#define LIBAVFILTER_VERSION_MINOR 2
2
#define LIBAVFILTER_VERSION_MINOR 2
3
#define LIBAVFILTER_VERSION_MICRO 0
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
...
...
@@ -255,6 +255,11 @@ int avfilter_add_format(AVFilterFormats **avff, int64_t fmt);
*/
AVFilterFormats
*
avfilter_all_formats
(
enum
AVMediaType
type
);
/**
* Return a list of all channel layouts supported by FFmpeg.
*/
AVFilterFormats
*
avfilter_all_channel_layouts
(
void
);
/**
* Return a format list which contains the intersection of the formats of
* a and b. Also, all the references of a, all the references of b, and
...
...
@@ -466,11 +471,13 @@ AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int per
int64_t
channel_layout
,
int
planar
);
/**
*
A helper for query_formats() which sets
all links to the same list of
* formats
. If there are no links hooked to this filter, the list of formats is
* freed.
*
Helpers for query_formats() which set
all links to the same list of
* formats
/layouts. If there are no links hooked to this filter, the list
*
of formats is
freed.
*/
void
avfilter_set_common_formats
(
AVFilterContext
*
ctx
,
AVFilterFormats
*
formats
);
void
avfilter_set_common_pixel_formats
(
AVFilterContext
*
ctx
,
AVFilterFormats
*
formats
);
void
avfilter_set_common_sample_formats
(
AVFilterContext
*
ctx
,
AVFilterFormats
*
formats
);
void
avfilter_set_common_channel_layouts
(
AVFilterContext
*
ctx
,
AVFilterFormats
*
formats
);
/** Default handler for query_formats() */
int
avfilter_default_query_formats
(
AVFilterContext
*
ctx
);
...
...
@@ -521,9 +528,9 @@ typedef struct AVFilter {
void
(
*
uninit
)(
AVFilterContext
*
ctx
);
/**
* Queries formats
supported by the filter and its pads, and sets the
*
in_formats for links connected to its output pads, and out_formats
* for links connected to its input pads.
* Queries formats
/layouts supported by the filter and its pads, and sets
*
the in_formats/in_chlayouts for links connected to its output pads,
*
and out_formats/out_chlayouts
for links connected to its input pads.
*
* @return zero on success, a negative value corresponding to an
* AVERROR code otherwise
...
...
@@ -593,13 +600,18 @@ struct AVFilterLink {
int
format
;
///< agreed upon media format
/**
* Lists of formats supported by the input and output filters respectively.
* These lists are used for negotiating the format to actually be used,
* which will be loaded into the format member, above, when chosen.
* Lists of formats and channel layouts supported by the input and output
* filters respectively. These lists are used for negotiating the format
* to actually be used, which will be loaded into the format and
* channel_layout members, above, when chosen.
*
*/
AVFilterFormats
*
in_formats
;
AVFilterFormats
*
out_formats
;
AVFilterFormats
*
in_chlayouts
;
AVFilterFormats
*
out_chlayouts
;
/**
* The buffer reference currently being sent across the link by the source
* filter. This is used internally by the filter system to allow
...
...
libavfilter/avfiltergraph.c
浏览文件 @
fd2c0a5d
...
...
@@ -195,9 +195,16 @@ static void pick_format(AVFilterLink *link)
link
->
in_formats
->
format_count
=
1
;
link
->
format
=
link
->
in_formats
->
formats
[
0
];
avfilter_formats_unref
(
&
link
->
in_formats
);
avfilter_formats_unref
(
&
link
->
out_formats
);
if
(
link
->
type
==
AVMEDIA_TYPE_AUDIO
)
{
link
->
in_chlayouts
->
format_count
=
1
;
link
->
channel_layout
=
link
->
in_chlayouts
->
formats
[
0
];
avfilter_formats_unref
(
&
link
->
in_chlayouts
);
avfilter_formats_unref
(
&
link
->
out_chlayouts
);
}
}
static
void
pick_formats
(
AVFilterGraph
*
graph
)
...
...
libavfilter/defaults.c
浏览文件 @
fd2c0a5d
...
...
@@ -197,45 +197,54 @@ int avfilter_default_config_output_link(AVFilterLink *link)
return
0
;
}
/**
* A helper for query_formats() which sets all links to the same list of
* formats. If there are no links hooked to this filter, the list of formats is
* freed.
*
* FIXME: this will need changed for filters with a mix of pad types
* (video + audio, etc)
*/
void
avfilter_set_common_formats
(
AVFilterContext
*
ctx
,
AVFilterFormats
*
formats
)
static
void
set_common_formats
(
AVFilterContext
*
ctx
,
AVFilterFormats
*
fmts
,
enum
AVMediaType
type
,
int
offin
,
int
offout
)
{
int
count
=
0
,
i
;
for
(
i
=
0
;
i
<
ctx
->
input_count
;
i
++
)
{
if
(
ctx
->
inputs
[
i
])
{
avfilter_formats_ref
(
formats
,
&
ctx
->
inputs
[
i
]
->
out_formats
);
count
++
;
}
}
for
(
i
=
0
;
i
<
ctx
->
output_count
;
i
++
)
{
if
(
ctx
->
outputs
[
i
])
{
avfilter_formats_ref
(
formats
,
&
ctx
->
outputs
[
i
]
->
in_formats
);
count
++
;
}
int
i
;
for
(
i
=
0
;
i
<
ctx
->
input_count
;
i
++
)
if
(
ctx
->
inputs
[
i
]
&&
ctx
->
inputs
[
i
]
->
type
==
type
)
avfilter_formats_ref
(
fmts
,
(
AVFilterFormats
**
)((
void
*
)
ctx
->
inputs
[
i
]
+
offout
));
for
(
i
=
0
;
i
<
ctx
->
output_count
;
i
++
)
if
(
ctx
->
outputs
[
i
]
&&
ctx
->
outputs
[
i
]
->
type
==
type
)
avfilter_formats_ref
(
fmts
,
(
AVFilterFormats
**
)((
void
*
)
ctx
->
outputs
[
i
]
+
offin
));
if
(
!
fmts
->
refcount
)
{
av_free
(
fmts
->
formats
);
av_free
(
fmts
->
refs
);
av_free
(
fmts
);
}
}
if
(
!
count
)
{
av_free
(
formats
->
formats
);
av_free
(
formats
->
refs
);
av_free
(
formats
);
}
void
avfilter_set_common_pixel_formats
(
AVFilterContext
*
ctx
,
AVFilterFormats
*
formats
)
{
set_common_formats
(
ctx
,
formats
,
AVMEDIA_TYPE_VIDEO
,
offsetof
(
AVFilterLink
,
in_formats
),
offsetof
(
AVFilterLink
,
out_formats
));
}
void
avfilter_set_common_sample_formats
(
AVFilterContext
*
ctx
,
AVFilterFormats
*
formats
)
{
set_common_formats
(
ctx
,
formats
,
AVMEDIA_TYPE_AUDIO
,
offsetof
(
AVFilterLink
,
in_formats
),
offsetof
(
AVFilterLink
,
out_formats
));
}
void
avfilter_set_common_channel_layouts
(
AVFilterContext
*
ctx
,
AVFilterFormats
*
formats
)
{
set_common_formats
(
ctx
,
formats
,
AVMEDIA_TYPE_AUDIO
,
offsetof
(
AVFilterLink
,
in_chlayouts
),
offsetof
(
AVFilterLink
,
out_chlayouts
));
}
int
avfilter_default_query_formats
(
AVFilterContext
*
ctx
)
{
enum
AVMediaType
type
=
ctx
->
inputs
&&
ctx
->
inputs
[
0
]
?
ctx
->
inputs
[
0
]
->
type
:
ctx
->
outputs
&&
ctx
->
outputs
[
0
]
?
ctx
->
outputs
[
0
]
->
type
:
AVMEDIA_TYPE_VIDEO
;
avfilter_set_common_pixel_formats
(
ctx
,
avfilter_all_formats
(
AVMEDIA_TYPE_VIDEO
));
avfilter_set_common_sample_formats
(
ctx
,
avfilter_all_formats
(
AVMEDIA_TYPE_AUDIO
));
avfilter_set_common_channel_layouts
(
ctx
,
avfilter_all_channel_layouts
())
;
avfilter_set_common_formats
(
ctx
,
avfilter_all_formats
(
type
));
return
0
;
}
...
...
libavfilter/formats.c
浏览文件 @
fd2c0a5d
...
...
@@ -20,6 +20,7 @@
*/
#include "libavutil/pixdesc.h"
#include "libavutil/audioconvert.h"
#include "avfilter.h"
/**
...
...
@@ -139,6 +140,27 @@ AVFilterFormats *avfilter_all_formats(enum AVMediaType type)
return
ret
;
}
AVFilterFormats
*
avfilter_all_channel_layouts
(
void
)
{
static
int64_t
chlayouts
[]
=
{
AV_CH_LAYOUT_MONO
,
AV_CH_LAYOUT_STEREO
,
AV_CH_LAYOUT_4POINT0
,
AV_CH_LAYOUT_QUAD
,
AV_CH_LAYOUT_5POINT0
,
AV_CH_LAYOUT_5POINT0_BACK
,
AV_CH_LAYOUT_5POINT1
,
AV_CH_LAYOUT_5POINT1_BACK
,
AV_CH_LAYOUT_5POINT1
|
AV_CH_LAYOUT_STEREO_DOWNMIX
,
AV_CH_LAYOUT_7POINT1
,
AV_CH_LAYOUT_7POINT1_WIDE
,
AV_CH_LAYOUT_7POINT1
|
AV_CH_LAYOUT_STEREO_DOWNMIX
,
-
1
,
};
return
avfilter_make_format64_list
(
chlayouts
);
}
void
avfilter_formats_ref
(
AVFilterFormats
*
f
,
AVFilterFormats
**
ref
)
{
*
ref
=
f
;
...
...
libavfilter/vf_blackframe.c
浏览文件 @
fd2c0a5d
...
...
@@ -44,7 +44,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vf_crop.c
浏览文件 @
fd2c0a5d
...
...
@@ -104,7 +104,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vf_cropdetect.c
浏览文件 @
fd2c0a5d
...
...
@@ -46,7 +46,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vf_drawbox.c
浏览文件 @
fd2c0a5d
...
...
@@ -70,7 +70,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vf_drawtext.c
浏览文件 @
fd2c0a5d
...
...
@@ -334,7 +334,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vf_fade.c
浏览文件 @
fd2c0a5d
...
...
@@ -78,7 +78,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vf_format.c
浏览文件 @
fd2c0a5d
...
...
@@ -88,7 +88,7 @@ static AVFilterFormats *make_format_list(FormatContext *format, int flag)
#if CONFIG_FORMAT_FILTER
static
int
query_formats_format
(
AVFilterContext
*
ctx
)
{
avfilter_set_common_formats
(
ctx
,
make_format_list
(
ctx
->
priv
,
1
));
avfilter_set_common_
pixel_
formats
(
ctx
,
make_format_list
(
ctx
->
priv
,
1
));
return
0
;
}
...
...
@@ -118,7 +118,7 @@ AVFilter avfilter_vf_format = {
#if CONFIG_NOFORMAT_FILTER
static
int
query_formats_noformat
(
AVFilterContext
*
ctx
)
{
avfilter_set_common_formats
(
ctx
,
make_format_list
(
ctx
->
priv
,
0
));
avfilter_set_common_
pixel_
formats
(
ctx
,
make_format_list
(
ctx
->
priv
,
0
));
return
0
;
}
...
...
libavfilter/vf_frei0r.c
浏览文件 @
fd2c0a5d
...
...
@@ -332,7 +332,7 @@ static int query_formats(AVFilterContext *ctx)
if
(
!
formats
)
return
AVERROR
(
ENOMEM
);
avfilter_set_common_formats
(
ctx
,
formats
);
avfilter_set_common_
pixel_
formats
(
ctx
,
formats
);
return
0
;
}
...
...
libavfilter/vf_gradfun.c
浏览文件 @
fd2c0a5d
...
...
@@ -160,7 +160,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vf_hflip.c
浏览文件 @
fd2c0a5d
...
...
@@ -62,7 +62,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vf_hqdn3d.c
浏览文件 @
fd2c0a5d
...
...
@@ -268,7 +268,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_YUV420P
,
PIX_FMT_YUV422P
,
PIX_FMT_YUV411P
,
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vf_libopencv.c
浏览文件 @
fd2c0a5d
...
...
@@ -61,7 +61,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_BGR24
,
PIX_FMT_BGRA
,
PIX_FMT_GRAY8
,
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vf_lut.c
浏览文件 @
fd2c0a5d
...
...
@@ -161,7 +161,7 @@ static int query_formats(AVFilterContext *ctx)
enum
PixelFormat
*
pix_fmts
=
lut
->
is_rgb
?
rgb_pix_fmts
:
lut
->
is_yuv
?
yuv_pix_fmts
:
all_pix_fmts
;
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vf_mp.c
浏览文件 @
fd2c0a5d
...
...
@@ -796,7 +796,7 @@ static int query_formats(AVFilterContext *ctx)
}
//We assume all allowed input formats are also allowed output formats
avfilter_set_common_formats
(
ctx
,
avfmts
);
avfilter_set_common_
pixel_
formats
(
ctx
,
avfmts
);
return
0
;
}
...
...
libavfilter/vf_pad.c
浏览文件 @
fd2c0a5d
...
...
@@ -83,7 +83,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vf_transpose.c
浏览文件 @
fd2c0a5d
...
...
@@ -83,7 +83,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vf_unsharp.c
浏览文件 @
fd2c0a5d
...
...
@@ -155,7 +155,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_YUVJ444P
,
PIX_FMT_YUVJ440P
,
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vf_yadif.c
浏览文件 @
fd2c0a5d
...
...
@@ -332,7 +332,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vsink_buffer.c
浏览文件 @
fd2c0a5d
...
...
@@ -66,7 +66,7 @@ static int query_formats(AVFilterContext *ctx)
{
BufferSinkContext
*
buf
=
ctx
->
priv
;
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
buf
->
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
buf
->
pix_fmts
));
return
0
;
}
...
...
libavfilter/vsrc_buffer.c
浏览文件 @
fd2c0a5d
...
...
@@ -166,7 +166,7 @@ static int query_formats(AVFilterContext *ctx)
BufferSourceContext
*
c
=
ctx
->
priv
;
enum
PixelFormat
pix_fmts
[]
=
{
c
->
pix_fmt
,
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vsrc_color.c
浏览文件 @
fd2c0a5d
...
...
@@ -99,7 +99,7 @@ static int query_formats(AVFilterContext *ctx)
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
libavfilter/vsrc_movie.c
浏览文件 @
fd2c0a5d
...
...
@@ -203,7 +203,7 @@ static int query_formats(AVFilterContext *ctx)
MovieContext
*
movie
=
ctx
->
priv
;
enum
PixelFormat
pix_fmts
[]
=
{
movie
->
codec_ctx
->
pix_fmt
,
PIX_FMT_NONE
};
avfilter_set_common_formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
avfilter_set_common_
pixel_
formats
(
ctx
,
avfilter_make_format_list
(
pix_fmts
));
return
0
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录