opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-09-10 01:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Define AVMediaType enum, and use it instead of enum CodecType, which

Browse Source 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini
2010-03-30 23:30:55 +00:00
parent ca6e7708b4
commit 72415b2adb
383 changed files with 1041 additions and 1029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/avfilter.h
View File

@ -280,7 +280,7 @@ struct AVFilterPad
* AVFilterPad type. Only video supported now, hopefully someone will
* add audio in the future.
*/
enum CodecType type;
enum AVMediaType type;
/**
* Minimum required permissions on incoming buffers. Any buffer with

8
libavfilter/vf_aspect.c
View File

@ -86,7 +86,7 @@ AVFilter avfilter_vf_aspect = {
.priv_size = sizeof(AspectContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.config_props = frameaspect_config_props,
.get_video_buffer = avfilter_null_get_video_buffer,
.start_frame = start_frame,
@ -94,7 +94,7 @@ AVFilter avfilter_vf_aspect = {
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO, },
.type = AVMEDIA_TYPE_VIDEO, },
{ .name = NULL}},
};
#endif /* CONFIG_ASPECT_FILTER */
@ -109,14 +109,14 @@ AVFilter avfilter_vf_pixelaspect = {
.priv_size = sizeof(AspectContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer = avfilter_null_get_video_buffer,
.start_frame = start_frame,
.end_frame = avfilter_null_end_frame },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO, },
.type = AVMEDIA_TYPE_VIDEO, },
{ .name = NULL}},
};
#endif /* CONFIG_PIXELASPECT_FILTER */

4
libavfilter/vf_crop.c
View File

@ -214,14 +214,14 @@ AVFilter avfilter_vf_crop = {
.init = init,
.inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.start_frame = start_frame,
.draw_slice = draw_slice,
.get_video_buffer = avfilter_null_get_video_buffer,
.config_props = config_input, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_output, },
{ .name = NULL}},
};

8
libavfilter/vf_format.c
View File

@ -103,14 +103,14 @@ AVFilter avfilter_vf_format = {
.priv_size = sizeof(FormatContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer= avfilter_null_get_video_buffer,
.start_frame = avfilter_null_start_frame,
.draw_slice = avfilter_null_draw_slice,
.end_frame = avfilter_null_end_frame, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO },
.type = AVMEDIA_TYPE_VIDEO },
{ .name = NULL}},
};
#endif /* CONFIG_FORMAT_FILTER */
@ -133,14 +133,14 @@ AVFilter avfilter_vf_noformat = {
.priv_size = sizeof(FormatContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer= avfilter_null_get_video_buffer,
.start_frame = avfilter_null_start_frame,
.draw_slice = avfilter_null_draw_slice,
.end_frame = avfilter_null_end_frame, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO },
.type = AVMEDIA_TYPE_VIDEO },
{ .name = NULL}},
};
#endif /* CONFIG_NOFORMAT_FILTER */

4
libavfilter/vf_null.c
View File

@ -30,13 +30,13 @@ AVFilter avfilter_vf_null = {
.priv_size = 0,
.inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer = avfilter_null_get_video_buffer,
.start_frame = avfilter_null_start_frame,
.end_frame = avfilter_null_end_frame },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO, },
.type = AVMEDIA_TYPE_VIDEO, },
{ .name = NULL}},
};

4
libavfilter/vf_scale.c
View File

@ -197,13 +197,13 @@ AVFilter avfilter_vf_scale = {
.priv_size = sizeof(ScaleContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.start_frame = start_frame,
.draw_slice = draw_slice,
.min_perms = AV_PERM_READ, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_props, },
{ .name = NULL}},
};

4
libavfilter/vf_slicify.c
View File

@ -104,7 +104,7 @@ AVFilter avfilter_vf_slicify = {
.priv_size = sizeof(SliceContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer = avfilter_null_get_video_buffer,
.start_frame = start_frame,
.draw_slice = draw_slice,
@ -112,6 +112,6 @@ AVFilter avfilter_vf_slicify = {
.end_frame = avfilter_null_end_frame, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO, },
.type = AVMEDIA_TYPE_VIDEO, },
{ .name = NULL}},
};

4
libavfilter/vf_vflip.c
View File

@ -91,7 +91,7 @@ AVFilter avfilter_vf_vflip = {
.priv_size = sizeof(FlipContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer = get_video_buffer,
.start_frame = start_frame,
.draw_slice = draw_slice,
@ -99,6 +99,6 @@ AVFilter avfilter_vf_vflip = {
.config_props = config_input, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
.type = CODEC_TYPE_VIDEO, },
.type = AVMEDIA_TYPE_VIDEO, },
{ .name = NULL}},
};

2
libavfilter/vsink_nullsink.c
View File

@ -35,7 +35,7 @@ AVFilter avfilter_vsink_nullsink = {
.inputs = (AVFilterPad[]) {
{
.name = "default",
.type = CODEC_TYPE_VIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.start_frame = start_frame,
.end_frame = end_frame,
},

2
libavfilter/vsrc_nullsrc.c
View File

@ -74,7 +74,7 @@ AVFilter avfilter_vsrc_nullsrc = {
.outputs = (AVFilterPad[]) {
{
.name = "default",
.type = CODEC_TYPE_VIDEO,
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_props,
.request_frame = request_frame,
},