From 41a52740d47ac0b02e99ae90ff9212cce71753e7 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 7 Dec 2014 19:53:18 +0100 Subject: avutil/opt: Fix AV_OPT_TYPE_BINARY case in av_opt_is_set_to_default() Fixes CID1257010 Reviewed-by: Lukasz Marek Signed-off-by: Michael Niedermayer --- libavutil/opt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavutil') diff --git a/libavutil/opt.c b/libavutil/opt.c index 4cf20693ff..af413d4b35 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1788,9 +1788,9 @@ int av_opt_is_set_to_default(void *obj, const AVOption *o) } tmp = {0}; int opt_size = *(int *)((void **)dst + 1); void *opt_ptr = *(void **)dst; - if (!opt_ptr && (!o->default_val.str || !strlen(o->default_val.str))) + if (!opt_size && (!o->default_val.str || !strlen(o->default_val.str))) return 1; - if (opt_ptr && o->default_val.str && !strlen(o->default_val.str)) + if (!opt_size || !o->default_val.str || !strlen(o->default_val.str )) return 0; if (opt_size != strlen(o->default_val.str) / 2) return 0; -- cgit v1.2.3