Merge commit '5639ed9abb58311f82cf3499b682d228290adb09'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 20:45:44 +0000 (21:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 20:45:44 +0000 (21:45 +0100)
* commit '5639ed9abb58311f82cf3499b682d228290adb09':
  mov: do not truncate the language-prefixed tag

Conflicts:
libavformat/mov.c

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

index 64c2c10..e18050a 100644 (file)
@@ -263,7 +263,7 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 #ifdef MOV_EXPORT_ALL_METADATA
     char tmp_key[5];
 #endif
-    char key2[16], language[4] = {0};
+    char key2[32], language[4] = {0};
     char *str = NULL;
     const char *key = NULL;
     uint16_t langcode = 0;