History

lavfi: replace empty input/output lists with null pointers

Mans Rullgard committed 14 years ago

Commit 1fce3611 parent 2f3402115 files · +21 −18Browse files

Unified · Split

15 files
  1. libavfilter/af_amix.c +1 −1
  2. libavfilter/af_channelsplit.c +1 −1
  3. libavfilter/af_join.c +1 −1
  4. libavfilter/asink_anullsink.c +1 −1
  5. libavfilter/asrc_anullsrc.c +1 −1
  6. libavfilter/avfilter.c +3 −0
  7. libavfilter/buffersink.c +2 −2
  8. libavfilter/buffersrc.c +2 −2
  9. libavfilter/split.c +2 −2
  10. libavfilter/vf_frei0r.c +1 −1
  11. libavfilter/vsink_nullsink.c +1 −1
  12. libavfilter/vsrc_color.c +1 −1
  13. libavfilter/vsrc_movie.c +1 −1
  14. libavfilter/vsrc_nullsrc.c +1 −1
  15. libavfilter/vsrc_testsrc.c +2 −2
libavfilter/af_amix.c+1−1
@@ -556,7 +556,7 @@ AVFilter avfilter_af_amix = { · 555 unmodified lines
556556 .uninit = uninit,
557557 .query_formats = query_formats,
558558
559− .inputs = (const AVFilterPad[]) {{ .name = NULL}},
559+ .inputs = NULL,
560560 .outputs = (const AVFilterPad[]) {{ .name = "default",
561561 .type = AVMEDIA_TYPE_AUDIO,
562562 .config_props = config_output,
libavfilter/af_channelsplit.c+1−1
@@ -148,5 +148,5 @@ AVFilter avfilter_af_channelsplit = { · 147 unmodified lines
148148 .type = AVMEDIA_TYPE_AUDIO,
149149 .filter_samples = filter_samples, },
150150 { NULL }},
151− .outputs = (const AVFilterPad[]){{ NULL }},
151+ .outputs = NULL,
152152 };
libavfilter/af_join.c+1−1
@@ -495,7 +495,7 @@ AVFilter avfilter_af_join = { · 494 unmodified lines
495495 .uninit = join_uninit,
496496 .query_formats = join_query_formats,
497497
498− .inputs = (const AVFilterPad[]){{ NULL }},
498+ .inputs = NULL,
499499 .outputs = (const AVFilterPad[]){{ .name = "default",
500500 .type = AVMEDIA_TYPE_AUDIO,
501501 .config_props = join_config_output,
libavfilter/asink_anullsink.c+1−1
@@ -39,5 +39,5 @@ AVFilter avfilter_asink_anullsink = { · 38 unmodified lines
3939 },
4040 { .name = NULL},
4141 },
42− .outputs = (const AVFilterPad[]) {{ .name = NULL }},
42+ .outputs = NULL,
4343 };
libavfilter/asrc_anullsrc.c+1−1
@@ -91,7 +91,7 @@ AVFilter avfilter_asrc_anullsrc = { · 90 unmodified lines
9191 .init = init,
9292 .priv_size = sizeof(ANullContext),
9393
94− .inputs = (const AVFilterPad[]) {{ .name = NULL}},
94+ .inputs = NULL,
9595
9696 .outputs = (const AVFilterPad[]) {{ .name = "default",
9797 .type = AVMEDIA_TYPE_AUDIO,
libavfilter/avfilter.c+3−0
@@ -302,6 +302,9 @@ static int pad_count(const AVFilterPad *pads) · 301 unmodified lines
302302 {
303303 int count;
304304
305+ if (!pads)
306+ return 0;
307+
305308 for(count = 0; pads->name; count ++) pads ++;
306309 return count;
307310 }
libavfilter/buffersink.c+2−2
@@ -152,7 +152,7 @@ AVFilter avfilter_vsink_buffer = { · 151 unmodified lines
152152 .min_perms = AV_PERM_READ,
153153 .needs_fifo = 1 },
154154 { .name = NULL }},
155− .outputs = (const AVFilterPad[]) {{ .name = NULL }},
155+ .outputs = NULL,
156156 };
157157
158158 AVFilter avfilter_asink_abuffer = {
@@ -167,5 +167,5 @@ AVFilter avfilter_asink_abuffer = { · 8 unmodified lines
167167 .min_perms = AV_PERM_READ,
168168 .needs_fifo = 1 },
169169 { .name = NULL }},
170− .outputs = (const AVFilterPad[]) {{ .name = NULL }},
170+ .outputs = NULL,
171171 };
libavfilter/buffersrc.c+2−2
@@ -364,7 +364,7 @@ AVFilter avfilter_vsrc_buffer = { · 363 unmodified lines
364364 .init = init_video,
365365 .uninit = uninit,
366366
367− .inputs = (const AVFilterPad[]) {{ .name = NULL }},
367+ .inputs = NULL,
368368 .outputs = (const AVFilterPad[]) {{ .name = "default",
369369 .type = AVMEDIA_TYPE_VIDEO,
370370 .request_frame = request_frame,
@@ -382,7 +382,7 @@ AVFilter avfilter_asrc_abuffer = { · 11 unmodified lines
382382 .init = init_audio,
383383 .uninit = uninit,
384384
385− .inputs = (const AVFilterPad[]) {{ .name = NULL }},
385+ .inputs = NULL,
386386 .outputs = (const AVFilterPad[]) {{ .name = "default",
387387 .type = AVMEDIA_TYPE_AUDIO,
388388 .request_frame = request_frame,
libavfilter/split.c+2−2
@@ -124,7 +124,7 @@ AVFilter avfilter_vf_split = { · 123 unmodified lines
124124 .draw_slice = draw_slice,
125125 .end_frame = end_frame, },
126126 { .name = NULL}},
127− .outputs = (const AVFilterPad[]) {{ .name = NULL}},
127+ .outputs = NULL,
128128 };
129129
130130 static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref)
@@ -160,5 +160,5 @@ AVFilter avfilter_af_asplit = { · 29 unmodified lines
160160 .get_audio_buffer = ff_null_get_audio_buffer,
161161 .filter_samples = filter_samples },
162162 { .name = NULL }},
163− .outputs = (const AVFilterPad[]) {{ .name = NULL }},
163+ .outputs = NULL,
164164 };
libavfilter/vf_frei0r.c+1−1
@@ -488,7 +488,7 @@ AVFilter avfilter_vsrc_frei0r_src = { · 487 unmodified lines
488488
489489 .query_formats = query_formats,
490490
491− .inputs = (const AVFilterPad[]) {{ .name = NULL}},
491+ .inputs = NULL,
492492
493493 .outputs = (const AVFilterPad[]) {{ .name = "default",
494494 .type = AVMEDIA_TYPE_VIDEO,
libavfilter/vsink_nullsink.c+1−1
@@ -45,5 +45,5 @@ AVFilter avfilter_vsink_nullsink = { · 44 unmodified lines
4545 },
4646 { .name = NULL},
4747 },
48− .outputs = (const AVFilterPad[]) {{ .name = NULL }},
48+ .outputs = NULL,
4949 };
libavfilter/vsrc_color.c+1−1
@@ -192,7 +192,7 @@ AVFilter avfilter_vsrc_color = { · 191 unmodified lines
192192
193193 .query_formats = query_formats,
194194
195− .inputs = (const AVFilterPad[]) {{ .name = NULL}},
195+ .inputs = NULL,
196196
197197 .outputs = (const AVFilterPad[]) {{ .name = "default",
198198 .type = AVMEDIA_TYPE_VIDEO,
libavfilter/vsrc_movie.c+1−1
@@ -317,7 +317,7 @@ AVFilter avfilter_vsrc_movie = { · 316 unmodified lines
317317 .uninit = uninit,
318318 .query_formats = query_formats,
319319
320− .inputs = (const AVFilterPad[]) {{ .name = NULL }},
320+ .inputs = NULL,
321321 .outputs = (const AVFilterPad[]) {{ .name = "default",
322322 .type = AVMEDIA_TYPE_VIDEO,
323323 .request_frame = request_frame,
libavfilter/vsrc_nullsrc.c+1−1
@@ -121,7 +121,7 @@ AVFilter avfilter_vsrc_nullsrc = { · 120 unmodified lines
121121 .init = init,
122122 .priv_size = sizeof(NullContext),
123123
124− .inputs = (const AVFilterPad[]) {{ .name = NULL}},
124+ .inputs = NULL,
125125
126126 .outputs = (const AVFilterPad[]) {
127127 {
libavfilter/vsrc_testsrc.c+2−2
@@ -367,7 +367,7 @@ AVFilter avfilter_vsrc_testsrc = { · 366 unmodified lines
367367
368368 .query_formats = test_query_formats,
369369
370− .inputs = (const AVFilterPad[]) {{ .name = NULL}},
370+ .inputs = NULL,
371371
372372 .outputs = (const AVFilterPad[]) {{ .name = "default",
373373 .type = AVMEDIA_TYPE_VIDEO,
@@ -494,7 +494,7 @@ AVFilter avfilter_vsrc_rgbtestsrc = { · 120 unmodified lines
494494
495495 .query_formats = rgbtest_query_formats,
496496
497− .inputs = (const AVFilterPad[]) {{ .name = NULL}},
497+ .inputs = NULL,
498498
499499 .outputs = (const AVFilterPad[]) {{ .name = "default",
500500 .type = AVMEDIA_TYPE_VIDEO,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t