[FFmpeg-soc] [soc]: r1890 - in libavfilter: avfilter.h avfiltergraph.c vf_crop.c vf_fifo.c vf_format.c vf_fps.c vf_hflip.c vf_negate.c vf_overlay.c vf_rotate.c vf_scale.c vf_setpts.c vf_slicify.c vf_split.c vf_transpose.c vf_vflip.c
vitor
subversion at mplayerhq.hu
Sun Feb 10 21:41:57 CET 2008
Author: vitor
Date: Sun Feb 10 21:41:57 2008
New Revision: 1890
Log:
Use CodecType for pad type
Modified:
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/vf_crop.c
libavfilter/vf_fifo.c
libavfilter/vf_format.c
libavfilter/vf_fps.c
libavfilter/vf_hflip.c
libavfilter/vf_negate.c
libavfilter/vf_overlay.c
libavfilter/vf_rotate.c
libavfilter/vf_scale.c
libavfilter/vf_setpts.c
libavfilter/vf_slicify.c
libavfilter/vf_split.c
libavfilter/vf_transpose.c
libavfilter/vf_vflip.c
Modified: libavfilter/avfilter.h
==============================================================================
--- libavfilter/avfilter.h (original)
+++ libavfilter/avfilter.h Sun Feb 10 21:41:57 2008
@@ -200,8 +200,7 @@ struct AVFilterPad
* AVFilterPad type. Only video supported now, hopefully someone will
* add audio in the future.
*/
- int type;
-#define AV_PAD_VIDEO 0 ///< video pad
+ enum CodecType type;
/**
* Minimum required permissions on incoming buffers. Any buffers with
Modified: libavfilter/avfiltergraph.c
==============================================================================
--- libavfilter/avfiltergraph.c (original)
+++ libavfilter/avfiltergraph.c Sun Feb 10 21:41:57 2008
@@ -278,7 +278,7 @@ static int add_graph_input(AVFilterConte
AVFilterPad graph_inpad =
{
.name = name,
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = graph_in_start_frame,
.end_frame = graph_in_end_frame,
.get_video_buffer = graph_in_get_video_buffer,
@@ -289,7 +289,7 @@ static int add_graph_input(AVFilterConte
AVFilterPad dummy_outpad =
{
.name = NULL, /* FIXME? */
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.request_frame = link_in_request_frame,
.poll_frame = link_in_poll_frame,
.config_props = link_in_config_props,
@@ -310,7 +310,7 @@ static int add_graph_output(AVFilterCont
AVFilterPad graph_outpad =
{
.name = name,
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.request_frame = graph_out_request_frame,
.poll_frame = graph_out_poll_frame,
.config_props = graph_out_config_props,
@@ -318,7 +318,7 @@ static int add_graph_output(AVFilterCont
AVFilterPad dummy_inpad =
{
.name = NULL, /* FIXME? */
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = link_out_start_frame,
.end_frame = link_out_end_frame,
.draw_slice = link_out_draw_slice,
Modified: libavfilter/vf_crop.c
==============================================================================
--- libavfilter/vf_crop.c (original)
+++ libavfilter/vf_crop.c Sun Feb 10 21:41:57 2008
@@ -148,13 +148,13 @@ AVFilter avfilter_vf_crop =
.init = init,
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,
.draw_slice = draw_slice,
.config_props = config_input, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.config_props = config_output, },
{ .name = NULL}},
};
Modified: libavfilter/vf_fifo.c
==============================================================================
--- libavfilter/vf_fifo.c (original)
+++ libavfilter/vf_fifo.c Sun Feb 10 21:41:57 2008
@@ -107,14 +107,14 @@ AVFilter avfilter_vf_fifo =
.priv_size = sizeof(BufferContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,
.draw_slice = draw_slice,
.end_frame = end_frame,
.rej_perms = AV_PERM_REUSE2, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.request_frame = request_frame, },
{ .name = NULL}},
};
Modified: libavfilter/vf_format.c
==============================================================================
--- libavfilter/vf_format.c (original)
+++ libavfilter/vf_format.c Sun Feb 10 21:41:57 2008
@@ -118,13 +118,13 @@ AVFilter avfilter_vf_noformat =
.priv_size = sizeof(FormatContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,
.draw_slice = draw_slice,
.end_frame = end_frame, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO },
+ .type = CODEC_TYPE_VIDEO },
{ .name = NULL}},
};
@@ -140,13 +140,13 @@ AVFilter avfilter_vf_format =
.priv_size = sizeof(FormatContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,
.draw_slice = draw_slice,
.end_frame = end_frame, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO },
+ .type = CODEC_TYPE_VIDEO },
{ .name = NULL}},
};
Modified: libavfilter/vf_fps.c
==============================================================================
--- libavfilter/vf_fps.c (original)
+++ libavfilter/vf_fps.c Sun Feb 10 21:41:57 2008
@@ -120,12 +120,12 @@ AVFilter avfilter_vf_fps =
.priv_size = sizeof(FPSContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,
.end_frame = end_frame, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.poll_frame = poll_frame,
.request_frame = request_frame, },
{ .name = NULL}},
Modified: libavfilter/vf_hflip.c
==============================================================================
--- libavfilter/vf_hflip.c (original)
+++ libavfilter/vf_hflip.c Sun Feb 10 21:41:57 2008
@@ -80,13 +80,13 @@ AVFilter avfilter_vf_hflip =
.priv_size = sizeof(FlipContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.draw_slice = draw_slice,
.config_props = config_props,
.min_perms = AV_PERM_READ, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO, },
+ .type = CODEC_TYPE_VIDEO, },
{ .name = NULL}},
};
Modified: libavfilter/vf_negate.c
==============================================================================
--- libavfilter/vf_negate.c (original)
+++ libavfilter/vf_negate.c Sun Feb 10 21:41:57 2008
@@ -104,13 +104,13 @@ AVFilter avfilter_vf_negate =
.query_formats = query_formats,
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.draw_slice = draw_slice,
.config_props = config_props,
.min_perms = AV_PERM_READ, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO, },
+ .type = CODEC_TYPE_VIDEO, },
{ .name = NULL}},
};
Modified: libavfilter/vf_overlay.c
==============================================================================
--- libavfilter/vf_overlay.c (original)
+++ libavfilter/vf_overlay.c Sun Feb 10 21:41:57 2008
@@ -191,21 +191,21 @@ AVFilter avfilter_vf_overlay =
.priv_size = sizeof(OverlayContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,
.config_props = config_input_main,
.end_frame = end_frame,
.min_perms = AV_PERM_READ,
.rej_perms = AV_PERM_REUSE2, },
{ .name = "sub",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,
.end_frame = end_frame,
.min_perms = AV_PERM_READ,
.rej_perms = AV_PERM_REUSE2, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.request_frame = request_frame, },
{ .name = NULL}},
};
Modified: libavfilter/vf_rotate.c
==============================================================================
--- libavfilter/vf_rotate.c (original)
+++ libavfilter/vf_rotate.c Sun Feb 10 21:41:57 2008
@@ -165,14 +165,14 @@ AVFilter avfilter_vf_rotate =
.query_formats = query_formats,
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.draw_slice = draw_slice,
.config_props = config_props_input,
.min_perms = AV_PERM_READ, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
.config_props = config_props_output,
- .type = AV_PAD_VIDEO, },
+ .type = CODEC_TYPE_VIDEO, },
{ .name = NULL}},
};
Modified: libavfilter/vf_scale.c
==============================================================================
--- libavfilter/vf_scale.c (original)
+++ libavfilter/vf_scale.c Sun Feb 10 21:41:57 2008
@@ -153,13 +153,13 @@ AVFilter avfilter_vf_scale =
.priv_size = sizeof(ScaleContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,
.end_frame = end_frame,
.min_perms = AV_PERM_READ, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.config_props = config_props, },
{ .name = NULL}},
};
Modified: libavfilter/vf_setpts.c
==============================================================================
--- libavfilter/vf_setpts.c (original)
+++ libavfilter/vf_setpts.c Sun Feb 10 21:41:57 2008
@@ -126,10 +126,10 @@ AVFilter avfilter_vf_setpts =
.priv_size = sizeof(SetPTSContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,},
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,},
+ .type = CODEC_TYPE_VIDEO,},
{ .name = NULL}},
};
Modified: libavfilter/vf_slicify.c
==============================================================================
--- libavfilter/vf_slicify.c (original)
+++ libavfilter/vf_slicify.c Sun Feb 10 21:41:57 2008
@@ -85,14 +85,14 @@ AVFilter avfilter_vf_slicify =
.init = init,
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,
.draw_slice = draw_slice,
.config_props = config_props,
.end_frame = end_frame, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO, },
+ .type = CODEC_TYPE_VIDEO, },
{ .name = NULL}},
};
Modified: libavfilter/vf_split.c
==============================================================================
--- libavfilter/vf_split.c (original)
+++ libavfilter/vf_split.c Sun Feb 10 21:41:57 2008
@@ -49,15 +49,15 @@ AVFilter avfilter_vf_split =
.author = "Bobby Bingham",
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,
.draw_slice = draw_slice,
.end_frame = end_frame, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO, },
+ .type = CODEC_TYPE_VIDEO, },
{ .name = "default2",
- .type = AV_PAD_VIDEO, },
+ .type = CODEC_TYPE_VIDEO, },
{ .name = NULL}},
};
Modified: libavfilter/vf_transpose.c
==============================================================================
--- libavfilter/vf_transpose.c (original)
+++ libavfilter/vf_transpose.c Sun Feb 10 21:41:57 2008
@@ -109,7 +109,7 @@ AVFilter avfilter_vf_transpose =
.query_formats = query_formats,
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,
.draw_slice = draw_slice,
.config_props = config_props_input,
@@ -117,7 +117,7 @@ AVFilter avfilter_vf_transpose =
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
.config_props = config_props_output,
- .type = AV_PAD_VIDEO, },
+ .type = CODEC_TYPE_VIDEO, },
{ .name = NULL}},
};
Modified: libavfilter/vf_vflip.c
==============================================================================
--- libavfilter/vf_vflip.c (original)
+++ libavfilter/vf_vflip.c Sun Feb 10 21:41:57 2008
@@ -69,13 +69,13 @@ AVFilter avfilter_vf_vflip =
.priv_size = sizeof(FlipContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO,
+ .type = CODEC_TYPE_VIDEO,
.start_frame = start_frame,
.draw_slice = draw_slice,
.config_props = config_input, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = AV_PAD_VIDEO, },
+ .type = CODEC_TYPE_VIDEO, },
{ .name = NULL}},
};
More information about the FFmpeg-soc
mailing list