Merge commit '6f4364ab'

* commit '6f4364ab':
  mov: Fix handling of zero-length metadata values

Conflicts:
	libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/mov.c

@@ -379,7 +379,7 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         return AVERROR_INVALIDDATA;
 
     // worst-case requirement for output string in case of utf8 coded input
-    str_size_alloc = raw ? str_size + 1 : str_size * 2;
+    str_size_alloc = (raw ? str_size : str_size * 2) + 1;
     str = av_malloc(str_size_alloc);
     if (!str)
         return AVERROR(ENOMEM);