From e1e22851c15b2b88de111353f53fe4c94431f883 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 10 Nov 2011 09:19:09 +0100 Subject: AVOptions: don't return an invalid option when option list is empty --- libavutil/opt.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libavutil/opt.c') diff --git a/libavutil/opt.c b/libavutil/opt.c index aa76301740..7c53024d25 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -56,9 +56,10 @@ const AVOption *av_next_option(void *obj, const AVOption *last) const AVOption *av_opt_next(void *obj, const AVOption *last) { - if (last && last[1].name) return ++last; - else if (last) return NULL; - else return (*(AVClass**)obj)->option; + AVClass *class = *(AVClass**)obj; + if (!last && class->option[0].name) return class->option; + if (last && last[1].name) return ++last; + return NULL; } static int read_number(const AVOption *o, void *dst, double *num, int *den, int64_t *intnum) -- cgit v1.2.3