generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

movdec: handle 0x7fff langcode as macintosh per the specs

Browse Source 
The correct point that seperates ISO and MAC language codes is 0x400
according to the current QT spec. Old QT specs did not list where this
seperation is but apparently only defined the meaning of the first 137.

(cherry picked from commit 9e71cc81f3)
This commit is contained in:
Baptiste Coudurier
2012-03-21 14:18:16 -07:00
committed by Reinhard Tartler
parent eabefe83f4
commit 7940306a47
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/isom.c
View File

@@ -347,7 +347,7 @@ int ff_mov_lang_to_iso639(unsigned code, char to[4])
memset(to, 0, 4); memset(to, 0, 4);
/* is it the mangled iso code? */ /* is it the mangled iso code? */
/* see http://www.geocities.com/xhelmboyx/quicktime/formats/mp4-layout.txt */ /* see http://www.geocities.com/xhelmboyx/quicktime/formats/mp4-layout.txt */
if (code > 138) { if (code >= 0x400 && code != 0x7fff) {
for (i = 2; i >= 0; i--) { for (i = 2; i >= 0; i--) {
to[i] = 0x60 + (code & 0x1f); to[i] = 0x60 + (code & 0x1f);
code >>= 5; code >>= 5;

2
libavformat/mov.c
View File

@@ -298,7 +298,7 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (parse) if (parse)
parse(c, pb, str_size, key); parse(c, pb, str_size, key);
else { else {
if (data_type == 3 || (data_type == 0 && langcode < 0x800)) { // MAC Encoded if (data_type == 3 || (data_type == 0 && (langcode < 0x400 || langcode == 0x7fff))) { // MAC Encoded
mov_read_mac_string(c, pb, str_size, str, sizeof(str)); mov_read_mac_string(c, pb, str_size, str, sizeof(str));
} else { } else {
avio_read(pb, str, str_size); avio_read(pb, str, str_size);