Some callers assume that item_name is always set, so this may be considered an API break. This reverts commit 0c6203c97a99f69dbaa6e4011d48c331e1111f5e.
Showing the changes to libavfilter (22 of 363 files). Show all
Unified · Split
| @@ -351,6 +351,7 @@ static const AVOption options[] = { · 350 unmodified lines | |||
| 351 | 351 | ||
| 352 | static const AVClass aresample_class = { | 352 | static const AVClass aresample_class = { |
| 353 | .class_name = "aresample", | 353 | .class_name = "aresample", |
| 354 | .item_name = av_default_item_name, | ||
| 354 | .option = options, | 355 | .option = options, |
| 355 | .version = LIBAVUTIL_VERSION_INT, | 356 | .version = LIBAVUTIL_VERSION_INT, |
| 356 | .child_class_iterate = resample_child_class_iterate, | 357 | .child_class_iterate = resample_child_class_iterate, |
| @@ -61,6 +61,7 @@ static const AVOption filtergraph_options[] = { · 60 unmodified lines | |||
| 61 | 61 | ||
| 62 | static const AVClass filtergraph_class = { | 62 | static const AVClass filtergraph_class = { |
| 63 | .class_name = "AVFilterGraph", | 63 | .class_name = "AVFilterGraph", |
| 64 | .item_name = av_default_item_name, | ||
| 64 | .version = LIBAVUTIL_VERSION_INT, | 65 | .version = LIBAVUTIL_VERSION_INT, |
| 65 | .option = filtergraph_options, | 66 | .option = filtergraph_options, |
| 66 | .category = AV_CLASS_CATEGORY_FILTER, | 67 | .category = AV_CLASS_CATEGORY_FILTER, |
| @@ -320,6 +320,7 @@ const AVClass *ff_framesync_child_class_iterate(void **iter); · 319 unmodified lines | |||
| 320 | #define FRAMESYNC_DEFINE_PURE_CLASS(name, desc, func_prefix, options) \ | 320 | #define FRAMESYNC_DEFINE_PURE_CLASS(name, desc, func_prefix, options) \ |
| 321 | static const AVClass name##_class = { \ | 321 | static const AVClass name##_class = { \ |
| 322 | .class_name = desc, \ | 322 | .class_name = desc, \ |
| 323 | .item_name = av_default_item_name, \ | ||
| 323 | .option = options, \ | 324 | .option = options, \ |
| 324 | .version = LIBAVUTIL_VERSION_INT, \ | 325 | .version = LIBAVUTIL_VERSION_INT, \ |
| 325 | .category = AV_CLASS_CATEGORY_FILTER, \ | 326 | .category = AV_CLASS_CATEGORY_FILTER, \ |
| @@ -317,6 +317,7 @@ int ff_request_frame(AVFilterLink *link); · 316 unmodified lines | |||
| 317 | #define AVFILTER_DEFINE_CLASS_EXT(name, desc, options) \ | 317 | #define AVFILTER_DEFINE_CLASS_EXT(name, desc, options) \ |
| 318 | static const AVClass name##_class = { \ | 318 | static const AVClass name##_class = { \ |
| 319 | .class_name = desc, \ | 319 | .class_name = desc, \ |
| 320 | .item_name = av_default_item_name, \ | ||
| 320 | .option = options, \ | 321 | .option = options, \ |
| 321 | .version = LIBAVUTIL_VERSION_INT, \ | 322 | .version = LIBAVUTIL_VERSION_INT, \ |
| 322 | .category = AV_CLASS_CATEGORY_FILTER, \ | 323 | .category = AV_CLASS_CATEGORY_FILTER, \ |
| @@ -336,6 +336,7 @@ static const AVFilterPad stack_outputs[] = { · 335 unmodified lines | |||
| 336 | #define DEFINE_STACK_FILTER(category, api, capi, filter_flags) \ | 336 | #define DEFINE_STACK_FILTER(category, api, capi, filter_flags) \ |
| 337 | static const AVClass category##_##api##_class = { \ | 337 | static const AVClass category##_##api##_class = { \ |
| 338 | .class_name = #category "_" #api, \ | 338 | .class_name = #category "_" #api, \ |
| 339 | .item_name = av_default_item_name, \ | ||
| 339 | .option = category##_##api##_options, \ | 340 | .option = category##_##api##_options, \ |
| 340 | .version = LIBAVUTIL_VERSION_INT, \ | 341 | .version = LIBAVUTIL_VERSION_INT, \ |
| 341 | }; \ | 342 | }; \ |
| @@ -435,6 +435,7 @@ static const AVOption options[] = { · 434 unmodified lines | |||
| 435 | 435 | ||
| 436 | static const AVClass cuda_bilateral_class = { | 436 | static const AVClass cuda_bilateral_class = { |
| 437 | .class_name = "cudabilateral", | 437 | .class_name = "cudabilateral", |
| 438 | .item_name = av_default_item_name, | ||
| 438 | .option = options, | 439 | .option = options, |
| 439 | .version = LIBAVUTIL_VERSION_INT, | 440 | .version = LIBAVUTIL_VERSION_INT, |
| 440 | }; | 441 | }; |
| @@ -338,6 +338,7 @@ exit: · 337 unmodified lines | |||
| 338 | 338 | ||
| 339 | static const AVClass bwdif_cuda_class = { | 339 | static const AVClass bwdif_cuda_class = { |
| 340 | .class_name = "bwdif_cuda", | 340 | .class_name = "bwdif_cuda", |
| 341 | .item_name = av_default_item_name, | ||
| 341 | .option = ff_yadif_options, | 342 | .option = ff_yadif_options, |
| 342 | .version = LIBAVUTIL_VERSION_INT, | 343 | .version = LIBAVUTIL_VERSION_INT, |
| 343 | .category = AV_CLASS_CATEGORY_FILTER, | 344 | .category = AV_CLASS_CATEGORY_FILTER, |
| @@ -375,6 +375,7 @@ static int bwdif_vulkan_config_output(AVFilterLink *outlink) · 374 unmodified lines | |||
| 375 | 375 | ||
| 376 | static const AVClass bwdif_vulkan_class = { | 376 | static const AVClass bwdif_vulkan_class = { |
| 377 | .class_name = "bwdif_vulkan", | 377 | .class_name = "bwdif_vulkan", |
| 378 | .item_name = av_default_item_name, | ||
| 378 | .option = ff_yadif_options, | 379 | .option = ff_yadif_options, |
| 379 | .version = LIBAVUTIL_VERSION_INT, | 380 | .version = LIBAVUTIL_VERSION_INT, |
| 380 | .category = AV_CLASS_CATEGORY_FILTER, | 381 | .category = AV_CLASS_CATEGORY_FILTER, |
| @@ -454,6 +454,7 @@ static const AVOption options[] = { · 453 unmodified lines | |||
| 454 | 454 | ||
| 455 | static const AVClass cudachromakey_class = { | 455 | static const AVClass cudachromakey_class = { |
| 456 | .class_name = "cudachromakey", | 456 | .class_name = "cudachromakey", |
| 457 | .item_name = av_default_item_name, | ||
| 457 | .option = options, | 458 | .option = options, |
| 458 | .version = LIBAVUTIL_VERSION_INT, | 459 | .version = LIBAVUTIL_VERSION_INT, |
| 459 | }; | 460 | }; |
| @@ -392,6 +392,7 @@ static const AVOption options[] = { · 391 unmodified lines | |||
| 392 | 392 | ||
| 393 | static const AVClass cudacolorspace_class = { | 393 | static const AVClass cudacolorspace_class = { |
| 394 | .class_name = "colorspace_cuda", | 394 | .class_name = "colorspace_cuda", |
| 395 | .item_name = av_default_item_name, | ||
| 395 | .option = options, | 396 | .option = options, |
| 396 | .version = LIBAVUTIL_VERSION_INT, | 397 | .version = LIBAVUTIL_VERSION_INT, |
| 397 | }; | 398 | }; |
| @@ -392,6 +392,7 @@ static const AVOption deint_vaapi_options[] = { · 391 unmodified lines | |||
| 392 | 392 | ||
| 393 | static const AVClass deint_vaapi_class = { | 393 | static const AVClass deint_vaapi_class = { |
| 394 | .class_name = "deinterlace_vaapi", | 394 | .class_name = "deinterlace_vaapi", |
| 395 | .item_name = av_default_item_name, | ||
| 395 | .option = deint_vaapi_options, | 396 | .option = deint_vaapi_options, |
| 396 | .version = LIBAVUTIL_VERSION_INT, | 397 | .version = LIBAVUTIL_VERSION_INT, |
| 397 | }; | 398 | }; |
| @@ -167,6 +167,7 @@ static av_cold void hwdownload_uninit(AVFilterContext *avctx) · 166 unmodified lines | |||
| 167 | 167 | ||
| 168 | static const AVClass hwdownload_class = { | 168 | static const AVClass hwdownload_class = { |
| 169 | .class_name = "hwdownload", | 169 | .class_name = "hwdownload", |
| 170 | .item_name = av_default_item_name, | ||
| 170 | .option = NULL, | 171 | .option = NULL, |
| 171 | .version = LIBAVUTIL_VERSION_INT, | 172 | .version = LIBAVUTIL_VERSION_INT, |
| 172 | }; | 173 | }; |
| @@ -1040,6 +1040,7 @@ static const AVOption scale_options[] = { · 1039 unmodified lines | |||
| 1040 | 1040 | ||
| 1041 | static const AVClass scale_class = { | 1041 | static const AVClass scale_class = { |
| 1042 | .class_name = "scale(2ref)", | 1042 | .class_name = "scale(2ref)", |
| 1043 | .item_name = av_default_item_name, | ||
| 1043 | .option = scale_options, | 1044 | .option = scale_options, |
| 1044 | .version = LIBAVUTIL_VERSION_INT, | 1045 | .version = LIBAVUTIL_VERSION_INT, |
| 1045 | .category = AV_CLASS_CATEGORY_FILTER, | 1046 | .category = AV_CLASS_CATEGORY_FILTER, |
| @@ -603,6 +603,7 @@ static const AVOption options[] = { · 602 unmodified lines | |||
| 603 | 603 | ||
| 604 | static const AVClass cudascale_class = { | 604 | static const AVClass cudascale_class = { |
| 605 | .class_name = "cudascale", | 605 | .class_name = "cudascale", |
| 606 | .item_name = av_default_item_name, | ||
| 606 | .option = options, | 607 | .option = options, |
| 607 | .version = LIBAVUTIL_VERSION_INT, | 608 | .version = LIBAVUTIL_VERSION_INT, |
| 608 | }; | 609 | }; |
| @@ -1013,6 +1013,7 @@ static const AVOption options[] = { · 1012 unmodified lines | |||
| 1013 | 1013 | ||
| 1014 | static const AVClass nppscale_class = { | 1014 | static const AVClass nppscale_class = { |
| 1015 | .class_name = "nppscale", | 1015 | .class_name = "nppscale", |
| 1016 | .item_name = av_default_item_name, | ||
| 1016 | .option = options, | 1017 | .option = options, |
| 1017 | .version = LIBAVUTIL_VERSION_INT, | 1018 | .version = LIBAVUTIL_VERSION_INT, |
| 1018 | .category = AV_CLASS_CATEGORY_FILTER, | 1019 | .category = AV_CLASS_CATEGORY_FILTER, |
| @@ -235,6 +235,7 @@ static const AVOption options[] = { · 234 unmodified lines | |||
| 235 | 235 | ||
| 236 | static const AVClass nppsharpen_class = { | 236 | static const AVClass nppsharpen_class = { |
| 237 | .class_name = "nppsharpen", | 237 | .class_name = "nppsharpen", |
| 238 | .item_name = av_default_item_name, | ||
| 238 | .option = options, | 239 | .option = options, |
| 239 | .version = LIBAVUTIL_VERSION_INT, | 240 | .version = LIBAVUTIL_VERSION_INT, |
| 240 | }; | 241 | }; |
| @@ -75,6 +75,7 @@ static const AVOption spp_options[] = { · 74 unmodified lines | |||
| 75 | 75 | ||
| 76 | static const AVClass spp_class = { | 76 | static const AVClass spp_class = { |
| 77 | .class_name = "spp", | 77 | .class_name = "spp", |
| 78 | .item_name = av_default_item_name, | ||
| 78 | .option = spp_options, | 79 | .option = spp_options, |
| 79 | .version = LIBAVUTIL_VERSION_INT, | 80 | .version = LIBAVUTIL_VERSION_INT, |
| 80 | .category = AV_CLASS_CATEGORY_FILTER, | 81 | .category = AV_CLASS_CATEGORY_FILTER, |
| @@ -440,6 +440,7 @@ static const AVOption options[] = { · 439 unmodified lines | |||
| 440 | 440 | ||
| 441 | static const AVClass npptranspose_class = { | 441 | static const AVClass npptranspose_class = { |
| 442 | .class_name = "npptranspose", | 442 | .class_name = "npptranspose", |
| 443 | .item_name = av_default_item_name, | ||
| 443 | .option = options, | 444 | .option = options, |
| 444 | .version = LIBAVUTIL_VERSION_INT, | 445 | .version = LIBAVUTIL_VERSION_INT, |
| 445 | }; | 446 | }; |
| @@ -824,6 +824,7 @@ static const AVFilterPad vpp_outputs[] = { · 823 unmodified lines | |||
| 824 | #define DEFINE_QSV_FILTER(x, sn, ln, fmts) \ | 824 | #define DEFINE_QSV_FILTER(x, sn, ln, fmts) \ |
| 825 | static const AVClass x##_class = { \ | 825 | static const AVClass x##_class = { \ |
| 826 | .class_name = #sn "_qsv", \ | 826 | .class_name = #sn "_qsv", \ |
| 827 | .item_name = av_default_item_name, \ | ||
| 827 | .option = x##_options, \ | 828 | .option = x##_options, \ |
| 828 | .version = LIBAVUTIL_VERSION_INT, \ | 829 | .version = LIBAVUTIL_VERSION_INT, \ |
| 829 | }; \ | 830 | }; \ |
| @@ -326,6 +326,7 @@ static int config_output(AVFilterLink *outlink) · 325 unmodified lines | |||
| 326 | 326 | ||
| 327 | static const AVClass yadif_class = { | 327 | static const AVClass yadif_class = { |
| 328 | .class_name = "yadif", | 328 | .class_name = "yadif", |
| 329 | .item_name = av_default_item_name, | ||
| 329 | .option = ff_yadif_options, | 330 | .option = ff_yadif_options, |
| 330 | .version = LIBAVUTIL_VERSION_INT, | 331 | .version = LIBAVUTIL_VERSION_INT, |
| 331 | .category = AV_CLASS_CATEGORY_FILTER, | 332 | .category = AV_CLASS_CATEGORY_FILTER, |
| @@ -338,6 +338,7 @@ exit: · 337 unmodified lines | |||
| 338 | 338 | ||
| 339 | static const AVClass yadif_cuda_class = { | 339 | static const AVClass yadif_cuda_class = { |
| 340 | .class_name = "yadif_cuda", | 340 | .class_name = "yadif_cuda", |
| 341 | .item_name = av_default_item_name, | ||
| 341 | .option = ff_yadif_options, | 342 | .option = ff_yadif_options, |
| 342 | .version = LIBAVUTIL_VERSION_INT, | 343 | .version = LIBAVUTIL_VERSION_INT, |
| 343 | .category = AV_CLASS_CATEGORY_FILTER, | 344 | .category = AV_CLASS_CATEGORY_FILTER, |
| @@ -61,6 +61,7 @@ static int vs2av_log(int type, const char *tag, const char *format, ...) · 60 unmodified lines | |||
| 61 | VS2AVLogCtx ctx; | 61 | VS2AVLogCtx ctx; |
| 62 | AVClass class = { | 62 | AVClass class = { |
| 63 | .class_name = tag, | 63 | .class_name = tag, |
| 64 | .item_name = av_default_item_name, | ||
| 64 | .option = 0, | 65 | .option = 0, |
| 65 | .version = LIBAVUTIL_VERSION_INT, | 66 | .version = LIBAVUTIL_VERSION_INT, |
| 66 | .category = AV_CLASS_CATEGORY_FILTER, | 67 | .category = AV_CLASS_CATEGORY_FILTER, |