diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 21:45:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 21:45:44 +0100 |
| commit | d0b0fe6691fc67a95f985cad10d7e66c9bc23587 (patch) | |
| tree | d7315fb6d3b0b0c1e1a0e67b11eca86cbbb9e62d | |
| parent | 1537d0b432d8cad62b6c8af1960674ac452be7ac (diff) | |
| parent | 5639ed9abb58311f82cf3499b682d228290adb09 (diff) | |
| download | ffmpeg-d0b0fe6691fc67a95f985cad10d7e66c9bc23587.tar.gz | |
Merge commit '5639ed9abb58311f82cf3499b682d228290adb09'
* commit '5639ed9abb58311f82cf3499b682d228290adb09':
mov: do not truncate the language-prefixed tag
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 64c2c10253..e18050a99f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -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; |