Fixes CID1257010 Signed-off-by: Michael Niedermayer <michae...@gmx.at> --- libavutil/opt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavutil/opt.c b/libavutil/opt.c index 4cf2069..d03df60 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; -- 1.7.9.5 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel