Unified · Split
| @@ -99,6 +99,9 @@ typedef struct TestSourceContext { · 98 unmodified lines | |||
| 99 | 99 | ||
| 100 | #define COMMON_OPTIONS SIZE_OPTIONS COMMON_OPTIONS_NOSIZE | 100 | #define COMMON_OPTIONS SIZE_OPTIONS COMMON_OPTIONS_NOSIZE |
| 101 | 101 | ||
| 102 | #define NOSIZE_OPTIONS_OFFSET 2 | ||
| 103 | /* Filters using COMMON_OPTIONS_NOSIZE also use the following options | ||
| 104 | * via &options[NOSIZE_OPTIONS_OFFSET]. So don't break it. */ | ||
| 102 | static const AVOption options[] = { | 105 | static const AVOption options[] = { |
| 103 | COMMON_OPTIONS | 106 | COMMON_OPTIONS |
| 104 | { NULL } | 107 | { NULL } |
| @@ -1653,11 +1656,7 @@ AVFilter ff_vsrc_smptehdbars = { · 1548 unmodified lines | |||
| 1653 | 1656 | ||
| 1654 | #if CONFIG_ALLYUV_FILTER | 1657 | #if CONFIG_ALLYUV_FILTER |
| 1655 | 1658 | ||
| 1656 | static const AVOption allyuv_options[] = { | 1659 | #define allyuv_options &options[NOSIZE_OPTIONS_OFFSET] |
| 1657 | COMMON_OPTIONS_NOSIZE | ||
| 1658 | { NULL } | ||
| 1659 | }; | ||
| 1660 | |||
| 1661 | AVFILTER_DEFINE_CLASS(allyuv); | 1660 | AVFILTER_DEFINE_CLASS(allyuv); |
| 1662 | 1661 | ||
| 1663 | static void allyuv_fill_picture(AVFilterContext *ctx, AVFrame *frame) | 1662 | static void allyuv_fill_picture(AVFilterContext *ctx, AVFrame *frame) |
| @@ -1734,11 +1733,7 @@ AVFilter ff_vsrc_allyuv = { · 70 unmodified lines | |||
| 1734 | 1733 | ||
| 1735 | #if CONFIG_ALLRGB_FILTER | 1734 | #if CONFIG_ALLRGB_FILTER |
| 1736 | 1735 | ||
| 1737 | static const AVOption allrgb_options[] = { | 1736 | #define allrgb_options &options[NOSIZE_OPTIONS_OFFSET] |
| 1738 | COMMON_OPTIONS_NOSIZE | ||
| 1739 | { NULL } | ||
| 1740 | }; | ||
| 1741 | |||
| 1742 | AVFILTER_DEFINE_CLASS(allrgb); | 1737 | AVFILTER_DEFINE_CLASS(allrgb); |
| 1743 | 1738 | ||
| 1744 | static void allrgb_fill_picture(AVFilterContext *ctx, AVFrame *frame) | 1739 | static void allrgb_fill_picture(AVFilterContext *ctx, AVFrame *frame) |