Unified · Split
| @@ -556,7 +556,7 @@ AVFilter avfilter_af_amix = { · 555 unmodified lines | |||
| 556 | .uninit = uninit, | 556 | .uninit = uninit, |
| 557 | .query_formats = query_formats, | 557 | .query_formats = query_formats, |
| 558 | 558 | ||
| 559 | .inputs = (const AVFilterPad[]) {{ .name = NULL}}, | 559 | .inputs = NULL, |
| 560 | .outputs = (const AVFilterPad[]) {{ .name = "default", | 560 | .outputs = (const AVFilterPad[]) {{ .name = "default", |
| 561 | .type = AVMEDIA_TYPE_AUDIO, | 561 | .type = AVMEDIA_TYPE_AUDIO, |
| 562 | .config_props = config_output, | 562 | .config_props = config_output, |
| @@ -148,5 +148,5 @@ AVFilter avfilter_af_channelsplit = { · 147 unmodified lines | |||
| 148 | .type = AVMEDIA_TYPE_AUDIO, | 148 | .type = AVMEDIA_TYPE_AUDIO, |
| 149 | .filter_samples = filter_samples, }, | 149 | .filter_samples = filter_samples, }, |
| 150 | { NULL }}, | 150 | { NULL }}, |
| 151 | .outputs = (const AVFilterPad[]){{ NULL }}, | 151 | .outputs = NULL, |
| 152 | }; | 152 | }; |
| @@ -495,7 +495,7 @@ AVFilter avfilter_af_join = { · 494 unmodified lines | |||
| 495 | .uninit = join_uninit, | 495 | .uninit = join_uninit, |
| 496 | .query_formats = join_query_formats, | 496 | .query_formats = join_query_formats, |
| 497 | 497 | ||
| 498 | .inputs = (const AVFilterPad[]){{ NULL }}, | 498 | .inputs = NULL, |
| 499 | .outputs = (const AVFilterPad[]){{ .name = "default", | 499 | .outputs = (const AVFilterPad[]){{ .name = "default", |
| 500 | .type = AVMEDIA_TYPE_AUDIO, | 500 | .type = AVMEDIA_TYPE_AUDIO, |
| 501 | .config_props = join_config_output, | 501 | .config_props = join_config_output, |
| @@ -39,5 +39,5 @@ AVFilter avfilter_asink_anullsink = { · 38 unmodified lines | |||
| 39 | }, | 39 | }, |
| 40 | { .name = NULL}, | 40 | { .name = NULL}, |
| 41 | }, | 41 | }, |
| 42 | .outputs = (const AVFilterPad[]) {{ .name = NULL }}, | 42 | .outputs = NULL, |
| 43 | }; | 43 | }; |
| @@ -91,7 +91,7 @@ AVFilter avfilter_asrc_anullsrc = { · 90 unmodified lines | |||
| 91 | .init = init, | 91 | .init = init, |
| 92 | .priv_size = sizeof(ANullContext), | 92 | .priv_size = sizeof(ANullContext), |
| 93 | 93 | ||
| 94 | .inputs = (const AVFilterPad[]) {{ .name = NULL}}, | 94 | .inputs = NULL, |
| 95 | 95 | ||
| 96 | .outputs = (const AVFilterPad[]) {{ .name = "default", | 96 | .outputs = (const AVFilterPad[]) {{ .name = "default", |
| 97 | .type = AVMEDIA_TYPE_AUDIO, | 97 | .type = AVMEDIA_TYPE_AUDIO, |
| @@ -302,6 +302,9 @@ static int pad_count(const AVFilterPad *pads) · 301 unmodified lines | |||
| 302 | { | 302 | { |
| 303 | int count; | 303 | int count; |
| 304 | 304 | ||
| 305 | if (!pads) | ||
| 306 | return 0; | ||
| 307 | |||
| 305 | for(count = 0; pads->name; count ++) pads ++; | 308 | for(count = 0; pads->name; count ++) pads ++; |
| 306 | return count; | 309 | return count; |
| 307 | } | 310 | } |
| @@ -152,7 +152,7 @@ AVFilter avfilter_vsink_buffer = { · 151 unmodified lines | |||
| 152 | .min_perms = AV_PERM_READ, | 152 | .min_perms = AV_PERM_READ, |
| 153 | .needs_fifo = 1 }, | 153 | .needs_fifo = 1 }, |
| 154 | { .name = NULL }}, | 154 | { .name = NULL }}, |
| 155 | .outputs = (const AVFilterPad[]) {{ .name = NULL }}, | 155 | .outputs = NULL, |
| 156 | }; | 156 | }; |
| 157 | 157 | ||
| 158 | AVFilter avfilter_asink_abuffer = { | 158 | AVFilter avfilter_asink_abuffer = { |
| @@ -167,5 +167,5 @@ AVFilter avfilter_asink_abuffer = { · 8 unmodified lines | |||
| 167 | .min_perms = AV_PERM_READ, | 167 | .min_perms = AV_PERM_READ, |
| 168 | .needs_fifo = 1 }, | 168 | .needs_fifo = 1 }, |
| 169 | { .name = NULL }}, | 169 | { .name = NULL }}, |
| 170 | .outputs = (const AVFilterPad[]) {{ .name = NULL }}, | 170 | .outputs = NULL, |
| 171 | }; | 171 | }; |
| @@ -364,7 +364,7 @@ AVFilter avfilter_vsrc_buffer = { · 363 unmodified lines | |||
| 364 | .init = init_video, | 364 | .init = init_video, |
| 365 | .uninit = uninit, | 365 | .uninit = uninit, |
| 366 | 366 | ||
| 367 | .inputs = (const AVFilterPad[]) {{ .name = NULL }}, | 367 | .inputs = NULL, |
| 368 | .outputs = (const AVFilterPad[]) {{ .name = "default", | 368 | .outputs = (const AVFilterPad[]) {{ .name = "default", |
| 369 | .type = AVMEDIA_TYPE_VIDEO, | 369 | .type = AVMEDIA_TYPE_VIDEO, |
| 370 | .request_frame = request_frame, | 370 | .request_frame = request_frame, |
| @@ -382,7 +382,7 @@ AVFilter avfilter_asrc_abuffer = { · 11 unmodified lines | |||
| 382 | .init = init_audio, | 382 | .init = init_audio, |
| 383 | .uninit = uninit, | 383 | .uninit = uninit, |
| 384 | 384 | ||
| 385 | .inputs = (const AVFilterPad[]) {{ .name = NULL }}, | 385 | .inputs = NULL, |
| 386 | .outputs = (const AVFilterPad[]) {{ .name = "default", | 386 | .outputs = (const AVFilterPad[]) {{ .name = "default", |
| 387 | .type = AVMEDIA_TYPE_AUDIO, | 387 | .type = AVMEDIA_TYPE_AUDIO, |
| 388 | .request_frame = request_frame, | 388 | .request_frame = request_frame, |
| @@ -124,7 +124,7 @@ AVFilter avfilter_vf_split = { · 123 unmodified lines | |||
| 124 | .draw_slice = draw_slice, | 124 | .draw_slice = draw_slice, |
| 125 | .end_frame = end_frame, }, | 125 | .end_frame = end_frame, }, |
| 126 | { .name = NULL}}, | 126 | { .name = NULL}}, |
| 127 | .outputs = (const AVFilterPad[]) {{ .name = NULL}}, | 127 | .outputs = NULL, |
| 128 | }; | 128 | }; |
| 129 | 129 | ||
| 130 | static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref) | 130 | static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *samplesref) |
| @@ -160,5 +160,5 @@ AVFilter avfilter_af_asplit = { · 29 unmodified lines | |||
| 160 | .get_audio_buffer = ff_null_get_audio_buffer, | 160 | .get_audio_buffer = ff_null_get_audio_buffer, |
| 161 | .filter_samples = filter_samples }, | 161 | .filter_samples = filter_samples }, |
| 162 | { .name = NULL }}, | 162 | { .name = NULL }}, |
| 163 | .outputs = (const AVFilterPad[]) {{ .name = NULL }}, | 163 | .outputs = NULL, |
| 164 | }; | 164 | }; |
| @@ -488,7 +488,7 @@ AVFilter avfilter_vsrc_frei0r_src = { · 487 unmodified lines | |||
| 488 | 488 | ||
| 489 | .query_formats = query_formats, | 489 | .query_formats = query_formats, |
| 490 | 490 | ||
| 491 | .inputs = (const AVFilterPad[]) {{ .name = NULL}}, | 491 | .inputs = NULL, |
| 492 | 492 | ||
| 493 | .outputs = (const AVFilterPad[]) {{ .name = "default", | 493 | .outputs = (const AVFilterPad[]) {{ .name = "default", |
| 494 | .type = AVMEDIA_TYPE_VIDEO, | 494 | .type = AVMEDIA_TYPE_VIDEO, |
| @@ -45,5 +45,5 @@ AVFilter avfilter_vsink_nullsink = { · 44 unmodified lines | |||
| 45 | }, | 45 | }, |
| 46 | { .name = NULL}, | 46 | { .name = NULL}, |
| 47 | }, | 47 | }, |
| 48 | .outputs = (const AVFilterPad[]) {{ .name = NULL }}, | 48 | .outputs = NULL, |
| 49 | }; | 49 | }; |
| @@ -192,7 +192,7 @@ AVFilter avfilter_vsrc_color = { · 191 unmodified lines | |||
| 192 | 192 | ||
| 193 | .query_formats = query_formats, | 193 | .query_formats = query_formats, |
| 194 | 194 | ||
| 195 | .inputs = (const AVFilterPad[]) {{ .name = NULL}}, | 195 | .inputs = NULL, |
| 196 | 196 | ||
| 197 | .outputs = (const AVFilterPad[]) {{ .name = "default", | 197 | .outputs = (const AVFilterPad[]) {{ .name = "default", |
| 198 | .type = AVMEDIA_TYPE_VIDEO, | 198 | .type = AVMEDIA_TYPE_VIDEO, |
| @@ -317,7 +317,7 @@ AVFilter avfilter_vsrc_movie = { · 316 unmodified lines | |||
| 317 | .uninit = uninit, | 317 | .uninit = uninit, |
| 318 | .query_formats = query_formats, | 318 | .query_formats = query_formats, |
| 319 | 319 | ||
| 320 | .inputs = (const AVFilterPad[]) {{ .name = NULL }}, | 320 | .inputs = NULL, |
| 321 | .outputs = (const AVFilterPad[]) {{ .name = "default", | 321 | .outputs = (const AVFilterPad[]) {{ .name = "default", |
| 322 | .type = AVMEDIA_TYPE_VIDEO, | 322 | .type = AVMEDIA_TYPE_VIDEO, |
| 323 | .request_frame = request_frame, | 323 | .request_frame = request_frame, |
| @@ -121,7 +121,7 @@ AVFilter avfilter_vsrc_nullsrc = { · 120 unmodified lines | |||
| 121 | .init = init, | 121 | .init = init, |
| 122 | .priv_size = sizeof(NullContext), | 122 | .priv_size = sizeof(NullContext), |
| 123 | 123 | ||
| 124 | .inputs = (const AVFilterPad[]) {{ .name = NULL}}, | 124 | .inputs = NULL, |
| 125 | 125 | ||
| 126 | .outputs = (const AVFilterPad[]) { | 126 | .outputs = (const AVFilterPad[]) { |
| 127 | { | 127 | { |
| @@ -367,7 +367,7 @@ AVFilter avfilter_vsrc_testsrc = { · 366 unmodified lines | |||
| 367 | 367 | ||
| 368 | .query_formats = test_query_formats, | 368 | .query_formats = test_query_formats, |
| 369 | 369 | ||
| 370 | .inputs = (const AVFilterPad[]) {{ .name = NULL}}, | 370 | .inputs = NULL, |
| 371 | 371 | ||
| 372 | .outputs = (const AVFilterPad[]) {{ .name = "default", | 372 | .outputs = (const AVFilterPad[]) {{ .name = "default", |
| 373 | .type = AVMEDIA_TYPE_VIDEO, | 373 | .type = AVMEDIA_TYPE_VIDEO, |
| @@ -494,7 +494,7 @@ AVFilter avfilter_vsrc_rgbtestsrc = { · 120 unmodified lines | |||
| 494 | 494 | ||
| 495 | .query_formats = rgbtest_query_formats, | 495 | .query_formats = rgbtest_query_formats, |
| 496 | 496 | ||
| 497 | .inputs = (const AVFilterPad[]) {{ .name = NULL}}, | 497 | .inputs = NULL, |
| 498 | 498 | ||
| 499 | .outputs = (const AVFilterPad[]) {{ .name = "default", | 499 | .outputs = (const AVFilterPad[]) {{ .name = "default", |
| 500 | .type = AVMEDIA_TYPE_VIDEO, | 500 | .type = AVMEDIA_TYPE_VIDEO, |