summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/opt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index cfff0c19d9..97b593cb2f 100644
--- a/libavcodec/opt.c
+++ b/libavcodec/opt.c
@@ -36,7 +36,7 @@ const AVOption *av_find_opt(void *v, const char *name, const char *unit, int mas
const AVOption *o= c->option;
for(;o && o->name; o++){
- if(!strcmp(o->name, name) && (!unit || !strcmp(o->unit, unit)) && (o->flags & mask) == flags )
+ if(!strcmp(o->name, name) && (!unit || (o->unit && !strcmp(o->unit, unit))) && (o->flags & mask) == flags )
return o;
}
return NULL;