summaryrefslogtreecommitdiff
path: root/libavformat/mov.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2012-03-21 14:18:16 -0700
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-03-09 18:09:39 +0100
commit9e71cc81f3655cacf0f91860fba3043f13b64059 (patch)
treef8e6be8766ba7018814c0a3d0bf0027c3791d60b /libavformat/mov.c
parent8a0bc40545a216a49f43db5d9a42a63961333354 (diff)
movdec: handle 0x7fff langcode as macintosh per the specs
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.
Diffstat (limited to 'libavformat/mov.c')
-rw-r--r--libavformat/mov.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index dc5b42b2d3..6f72ce8144 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -298,7 +298,7 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (parse)
parse(c, pb, str_size, key);
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));
} else {
avio_read(pb, str, str_size);