virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Anton Khirnov
2011-11-10 09:19:09 +01:00
parent 45fcb86cf8
commit e1e22851c1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavutil/opt.c
View File

@@ -56,9 +56,10 @@ const AVOption *av_next_option(void *obj, const AVOption *last)
const AVOption *av_opt_next(void *obj, const AVOption *last) const AVOption *av_opt_next(void *obj, const AVOption *last)
{ {
if (last && last[1].name) return ++last; AVClass *class = *(AVClass**)obj;
else if (last) return NULL; if (!last && class->option[0].name) return class->option;
else return (*(AVClass**)obj)->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) static int read_number(const AVOption *o, void *dst, double *num, int *den, int64_t *intnum)