summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-05-27 16:54:22 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-05-27 16:55:07 +0200
commit87ababd7c5adb6d82a3a642b9b6e2223b3a4025b (patch)
treebd1ee893903628e1194e7f60e7271408a4b0d008 /libavutil
parent041dbd3c145046e1bfd35079d23c6843a2f703cb (diff)
avopt: fix segfault
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/opt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 8f2d9a69db..6b2bc7712d 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -45,7 +45,7 @@ const AVOption *av_find_opt(void *v, const char *name, const char *unit, int mas
const AVOption *av_next_option(void *obj, const AVOption *last)
{
if (last && last[1].name) return ++last;
- else if (last) return NULL;
+ else if (last || !(*(AVClass**)obj)->option->name) return NULL;
else return (*(AVClass**)obj)->option;
}