Browse Source

lavfi: replace empty input/output lists with null pointers

Signed-off-by: Mans Rullgard <mans@mansr.com>
tags/n1.0
Mans Rullgard 13 years ago
parent
commit
1fce361d70
15 changed files with 21 additions and 18 deletions
  1. +1
    -1
      libavfilter/af_amix.c
  2. +1
    -1
      libavfilter/af_channelsplit.c
  3. +1
    -1
      libavfilter/af_join.c
  4. +1
    -1
      libavfilter/asink_anullsink.c
  5. +1
    -1
      libavfilter/asrc_anullsrc.c
  6. +3
    -0
      libavfilter/avfilter.c
  7. +2
    -2
      libavfilter/buffersink.c
  8. +2
    -2
      libavfilter/buffersrc.c
  9. +2
    -2
      libavfilter/split.c
  10. +1
    -1
      libavfilter/vf_frei0r.c
  11. +1
    -1
      libavfilter/vsink_nullsink.c
  12. +1
    -1
      libavfilter/vsrc_color.c
  13. +1
    -1
      libavfilter/vsrc_movie.c
  14. +1
    -1
      libavfilter/vsrc_nullsrc.c
  15. +2
    -2
      libavfilter/vsrc_testsrc.c

+ 1
- 1
libavfilter/af_amix.c View File

@@ -556,7 +556,7 @@ AVFilter avfilter_af_amix = {
.uninit = uninit, .uninit = uninit,
.query_formats = query_formats, .query_formats = query_formats,


.inputs = (const AVFilterPad[]) {{ .name = NULL}},
.inputs = NULL,
.outputs = (const AVFilterPad[]) {{ .name = "default", .outputs = (const AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.config_props = config_output, .config_props = config_output,


+ 1
- 1
libavfilter/af_channelsplit.c View File

@@ -148,5 +148,5 @@ AVFilter avfilter_af_channelsplit = {
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.filter_samples = filter_samples, }, .filter_samples = filter_samples, },
{ NULL }}, { NULL }},
.outputs = (const AVFilterPad[]){{ NULL }},
.outputs = NULL,
}; };

+ 1
- 1
libavfilter/af_join.c View File

@@ -495,7 +495,7 @@ AVFilter avfilter_af_join = {
.uninit = join_uninit, .uninit = join_uninit,
.query_formats = join_query_formats, .query_formats = join_query_formats,


.inputs = (const AVFilterPad[]){{ NULL }},
.inputs = NULL,
.outputs = (const AVFilterPad[]){{ .name = "default", .outputs = (const AVFilterPad[]){{ .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.config_props = join_config_output, .config_props = join_config_output,


+ 1
- 1
libavfilter/asink_anullsink.c View File

@@ -39,5 +39,5 @@ AVFilter avfilter_asink_anullsink = {
}, },
{ .name = NULL}, { .name = NULL},
}, },
.outputs = (const AVFilterPad[]) {{ .name = NULL }},
.outputs = NULL,
}; };

+ 1
- 1
libavfilter/asrc_anullsrc.c View File

@@ -91,7 +91,7 @@ AVFilter avfilter_asrc_anullsrc = {
.init = init, .init = init,
.priv_size = sizeof(ANullContext), .priv_size = sizeof(ANullContext),


.inputs = (const AVFilterPad[]) {{ .name = NULL}},
.inputs = NULL,


.outputs = (const AVFilterPad[]) {{ .name = "default", .outputs = (const AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,


+ 3
- 0
libavfilter/avfilter.c View File

@@ -302,6 +302,9 @@ static int pad_count(const AVFilterPad *pads)
{ {
int count; int count;


if (!pads)
return 0;

for(count = 0; pads->name; count ++) pads ++; for(count = 0; pads->name; count ++) pads ++;
return count; return count;
} }


+ 2
- 2
libavfilter/buffersink.c View File

@@ -152,7 +152,7 @@ AVFilter avfilter_vsink_buffer = {
.min_perms = AV_PERM_READ, .min_perms = AV_PERM_READ,
.needs_fifo = 1 }, .needs_fifo = 1 },
{ .name = NULL }}, { .name = NULL }},
.outputs = (const AVFilterPad[]) {{ .name = NULL }},
.outputs = NULL,
}; };


AVFilter avfilter_asink_abuffer = { AVFilter avfilter_asink_abuffer = {
@@ -167,5 +167,5 @@ AVFilter avfilter_asink_abuffer = {
.min_perms = AV_PERM_READ, .min_perms = AV_PERM_READ,
.needs_fifo = 1 }, .needs_fifo = 1 },
{ .name = NULL }}, { .name = NULL }},
.outputs = (const AVFilterPad[]) {{ .name = NULL }},
.outputs = NULL,
}; };

+ 2
- 2
libavfilter/buffersrc.c View File

@@ -364,7 +364,7 @@ AVFilter avfilter_vsrc_buffer = {
.init = init_video, .init = init_video,
.uninit = uninit, .uninit = uninit,


.inputs = (const AVFilterPad[]) {{ .name = NULL }},
.inputs = NULL,
.outputs = (const AVFilterPad[]) {{ .name = "default", .outputs = (const AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.request_frame = request_frame, .request_frame = request_frame,
@@ -382,7 +382,7 @@ AVFilter avfilter_asrc_abuffer = {
.init = init_audio, .init = init_audio,
.uninit = uninit, .uninit = uninit,


.inputs = (const AVFilterPad[]) {{ .name = NULL }},
.inputs = NULL,
.outputs = (const AVFilterPad[]) {{ .name = "default", .outputs = (const AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.request_frame = request_frame, .request_frame = request_frame,


+ 2
- 2
libavfilter/split.c View File

@@ -124,7 +124,7 @@ AVFilter avfilter_vf_split = {
.draw_slice = draw_slice, .draw_slice = draw_slice,
.end_frame = end_frame, }, .end_frame = end_frame, },
{ .name = NULL}}, { .name = NULL}},
.outputs = (const AVFilterPad[]) {{ .name = NULL}},
.outputs = NULL,
}; };


static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref) static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref)
@@ -160,5 +160,5 @@ AVFilter avfilter_af_asplit = {
.get_audio_buffer = ff_null_get_audio_buffer, .get_audio_buffer = ff_null_get_audio_buffer,
.filter_samples = filter_samples }, .filter_samples = filter_samples },
{ .name = NULL }}, { .name = NULL }},
.outputs = (const AVFilterPad[]) {{ .name = NULL }},
.outputs = NULL,
}; };

+ 1
- 1
libavfilter/vf_frei0r.c View File

@@ -488,7 +488,7 @@ AVFilter avfilter_vsrc_frei0r_src = {


.query_formats = query_formats, .query_formats = query_formats,


.inputs = (const AVFilterPad[]) {{ .name = NULL}},
.inputs = NULL,


.outputs = (const AVFilterPad[]) {{ .name = "default", .outputs = (const AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,


+ 1
- 1
libavfilter/vsink_nullsink.c View File

@@ -45,5 +45,5 @@ AVFilter avfilter_vsink_nullsink = {
}, },
{ .name = NULL}, { .name = NULL},
}, },
.outputs = (const AVFilterPad[]) {{ .name = NULL }},
.outputs = NULL,
}; };

+ 1
- 1
libavfilter/vsrc_color.c View File

@@ -192,7 +192,7 @@ AVFilter avfilter_vsrc_color = {


.query_formats = query_formats, .query_formats = query_formats,


.inputs = (const AVFilterPad[]) {{ .name = NULL}},
.inputs = NULL,


.outputs = (const AVFilterPad[]) {{ .name = "default", .outputs = (const AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,


+ 1
- 1
libavfilter/vsrc_movie.c View File

@@ -317,7 +317,7 @@ AVFilter avfilter_vsrc_movie = {
.uninit = uninit, .uninit = uninit,
.query_formats = query_formats, .query_formats = query_formats,


.inputs = (const AVFilterPad[]) {{ .name = NULL }},
.inputs = NULL,
.outputs = (const AVFilterPad[]) {{ .name = "default", .outputs = (const AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.request_frame = request_frame, .request_frame = request_frame,


+ 1
- 1
libavfilter/vsrc_nullsrc.c View File

@@ -121,7 +121,7 @@ AVFilter avfilter_vsrc_nullsrc = {
.init = init, .init = init,
.priv_size = sizeof(NullContext), .priv_size = sizeof(NullContext),


.inputs = (const AVFilterPad[]) {{ .name = NULL}},
.inputs = NULL,


.outputs = (const AVFilterPad[]) { .outputs = (const AVFilterPad[]) {
{ {


+ 2
- 2
libavfilter/vsrc_testsrc.c View File

@@ -367,7 +367,7 @@ AVFilter avfilter_vsrc_testsrc = {


.query_formats = test_query_formats, .query_formats = test_query_formats,


.inputs = (const AVFilterPad[]) {{ .name = NULL}},
.inputs = NULL,


.outputs = (const AVFilterPad[]) {{ .name = "default", .outputs = (const AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
@@ -494,7 +494,7 @@ AVFilter avfilter_vsrc_rgbtestsrc = {


.query_formats = rgbtest_query_formats, .query_formats = rgbtest_query_formats,


.inputs = (const AVFilterPad[]) {{ .name = NULL}},
.inputs = NULL,


.outputs = (const AVFilterPad[]) {{ .name = "default", .outputs = (const AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,


Loading…
Cancel
Save