Commit e1e22851 authored by Anton Khirnov's avatar Anton Khirnov

AVOptions: don't return an invalid option when option list is empty

parent 45fcb86c
......@@ -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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment