Merge commit '07a0c0f0'

* commit '07a0c0f0':
  opt: check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavutil/opt.c

@@ -143,6 +143,8 @@ static int set_string_binary(void *obj, const AVOption *o, const char *val, uint
     len /= 2;
 
     ptr = bin = av_malloc(len);
+    if (!ptr)
+        return AVERROR(ENOMEM);
     while (*val) {
         int a = hexchar2int(*val++);
         int b = hexchar2int(*val++);