From 7c91b3021c7af9bea6b65f51d645f7574a883870 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Fri, 20 Nov 2015 20:48:06 -0800 Subject: imgutils: Use designated initializers for AVClass More readable and less breakable. --- libavutil/imgutils.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'libavutil') diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 8956ae31ec..783fdb4176 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -236,11 +236,21 @@ typedef struct ImgUtils { void *log_ctx; } ImgUtils; -static const AVClass imgutils_class = { "IMGUTILS", av_default_item_name, NULL, LIBAVUTIL_VERSION_INT, offsetof(ImgUtils, log_offset), offsetof(ImgUtils, log_ctx) }; +static const AVClass imgutils_class = { + .class_name = "IMGUTILS", + .item_name = av_default_item_name, + .version = LIBAVUTIL_VERSION_INT, + .log_level_offset_offset = offsetof(ImgUtils, log_offset), + .parent_log_context_offset = offsetof(ImgUtils, log_ctx), +}; int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx) { - ImgUtils imgutils = { &imgutils_class, log_offset, log_ctx }; + ImgUtils imgutils = { + .class = &imgutils_class, + .log_offset = log_offset, + .log_ctx = log_ctx, + }; if ((int)w>0 && (int)h>0 && (w+128)*(uint64_t)(h+128) < INT_MAX/8) return 0; -- cgit v1.2.3