Merge commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 21:26:40 +0000 (22:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 21:26:40 +0000 (22:26 +0100)
* commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09':
  mov: allocate the tag value dynamically

Conflicts:
libavformat/mov.c

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

index 73178c9..8d66c0a 100644 (file)
@@ -385,7 +385,6 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
             key, str, (char*)&atom.type, str_size_alloc, atom.size);
 
     av_freep(&str);
-
     return 0;
 }