Fixes warnings with -pedantic with GCC and Clang.
Unified · Split
| @@ -705,28 +705,28 @@ static int blend_slice_##format_(AVFilterContext *ctx, void *arg, int jobnr, int · 704 unmodified lines | ||
| 705 | 705 | } |
| 706 | 706 | |
| 707 | 707 | // FMT FN H V A D |
| 708 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuv420, yuv_8_8bits, 1, 1, 0, 1); | |
| 709 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuva420, yuv_8_8bits, 1, 1, 1, 1); | |
| 710 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuv420p10, yuv_16_10bits, 1, 1, 0, 1); | |
| 711 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuva420p10, yuv_16_10bits, 1, 1, 1, 1); | |
| 712 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuv422p10, yuv_16_10bits, 1, 0, 0, 1); | |
| 713 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuva422p10, yuv_16_10bits, 1, 0, 1, 1); | |
| 714 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuv422, yuv_8_8bits, 1, 0, 0, 1); | |
| 715 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuva422, yuv_8_8bits, 1, 0, 1, 1); | |
| 716 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuv444, yuv_8_8bits, 0, 0, 0, 1); | |
| 717 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuva444, yuv_8_8bits, 0, 0, 1, 1); | |
| 718 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuv444p10, yuv_16_10bits, 0, 0, 0, 1); | |
| 719 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuva444p10, yuv_16_10bits, 0, 0, 1, 1); | |
| 720 | −DEFINE_BLEND_SLICE_PLANAR_FMT(gbrp, planar_rgb, 0, 0, 0, 1); | |
| 721 | −DEFINE_BLEND_SLICE_PLANAR_FMT(gbrap, planar_rgb, 0, 0, 1, 1); | |
| 722 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuv420_pm, yuv_8_8bits, 1, 1, 0, 0); | |
| 723 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuva420_pm, yuv_8_8bits, 1, 1, 1, 0); | |
| 724 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuv422_pm, yuv_8_8bits, 1, 0, 0, 0); | |
| 725 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuva422_pm, yuv_8_8bits, 1, 0, 1, 0); | |
| 726 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuv444_pm, yuv_8_8bits, 0, 0, 0, 0); | |
| 727 | −DEFINE_BLEND_SLICE_PLANAR_FMT(yuva444_pm, yuv_8_8bits, 0, 0, 1, 0); | |
| 728 | −DEFINE_BLEND_SLICE_PLANAR_FMT(gbrp_pm, planar_rgb, 0, 0, 0, 0); | |
| 729 | −DEFINE_BLEND_SLICE_PLANAR_FMT(gbrap_pm, planar_rgb, 0, 0, 1, 0); | |
| 708 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuv420, yuv_8_8bits, 1, 1, 0, 1) | |
| 709 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuva420, yuv_8_8bits, 1, 1, 1, 1) | |
| 710 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuv420p10, yuv_16_10bits, 1, 1, 0, 1) | |
| 711 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuva420p10, yuv_16_10bits, 1, 1, 1, 1) | |
| 712 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuv422p10, yuv_16_10bits, 1, 0, 0, 1) | |
| 713 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuva422p10, yuv_16_10bits, 1, 0, 1, 1) | |
| 714 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuv422, yuv_8_8bits, 1, 0, 0, 1) | |
| 715 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuva422, yuv_8_8bits, 1, 0, 1, 1) | |
| 716 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuv444, yuv_8_8bits, 0, 0, 0, 1) | |
| 717 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuva444, yuv_8_8bits, 0, 0, 1, 1) | |
| 718 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuv444p10, yuv_16_10bits, 0, 0, 0, 1) | |
| 719 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuva444p10, yuv_16_10bits, 0, 0, 1, 1) | |
| 720 | +DEFINE_BLEND_SLICE_PLANAR_FMT(gbrp, planar_rgb, 0, 0, 0, 1) | |
| 721 | +DEFINE_BLEND_SLICE_PLANAR_FMT(gbrap, planar_rgb, 0, 0, 1, 1) | |
| 722 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuv420_pm, yuv_8_8bits, 1, 1, 0, 0) | |
| 723 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuva420_pm, yuv_8_8bits, 1, 1, 1, 0) | |
| 724 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuv422_pm, yuv_8_8bits, 1, 0, 0, 0) | |
| 725 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuva422_pm, yuv_8_8bits, 1, 0, 1, 0) | |
| 726 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuv444_pm, yuv_8_8bits, 0, 0, 0, 0) | |
| 727 | +DEFINE_BLEND_SLICE_PLANAR_FMT(yuva444_pm, yuv_8_8bits, 0, 0, 1, 0) | |
| 728 | +DEFINE_BLEND_SLICE_PLANAR_FMT(gbrp_pm, planar_rgb, 0, 0, 0, 0) | |
| 729 | +DEFINE_BLEND_SLICE_PLANAR_FMT(gbrap_pm, planar_rgb, 0, 0, 1, 0) | |
| 730 | 730 | |
| 731 | 731 | #define DEFINE_BLEND_SLICE_PACKED_FMT(format_, blend_slice_fn_suffix_, main_has_alpha_, direct_) \ |
| 732 | 732 | static int blend_slice_##format_(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) \ |
| @@ -741,10 +741,10 @@ static int blend_slice_##format_(AVFilterContext *ctx, void *arg, int jobnr, int · 8 unmodified lines | ||
| 741 | 741 | } |
| 742 | 742 | |
| 743 | 743 | // FMT FN A D |
| 744 | −DEFINE_BLEND_SLICE_PACKED_FMT(rgb, rgb, 0, 1); | |
| 745 | −DEFINE_BLEND_SLICE_PACKED_FMT(rgba, rgb, 1, 1); | |
| 746 | −DEFINE_BLEND_SLICE_PACKED_FMT(rgb_pm, rgb, 0, 0); | |
| 747 | −DEFINE_BLEND_SLICE_PACKED_FMT(rgba_pm, rgb, 1, 0); | |
| 744 | +DEFINE_BLEND_SLICE_PACKED_FMT(rgb, rgb, 0, 1) | |
| 745 | +DEFINE_BLEND_SLICE_PACKED_FMT(rgba, rgb, 1, 1) | |
| 746 | +DEFINE_BLEND_SLICE_PACKED_FMT(rgb_pm, rgb, 0, 0) | |
| 747 | +DEFINE_BLEND_SLICE_PACKED_FMT(rgba_pm, rgb, 1, 0) | |
| 748 | 748 | |
| 749 | 749 | static int config_input_main(AVFilterLink *inlink) |
| 750 | 750 | { |