diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2012-03-21 14:18:16 -0700 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-05-03 12:06:08 -0400 |
| commit | 42a8d326978f6cf64fdc6deec8a3d91e5e1eaf07 (patch) | |
| tree | dde4fd36a9967ad6d85462fc683fa0f48c231727 | |
| parent | 945a1b7ab9b9df317e175e480a135a41e7e05b5c (diff) | |
| download | ffmpeg-42a8d326978f6cf64fdc6deec8a3d91e5e1eaf07.tar.gz | |
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.
(cherry picked from commit 9e71cc81f3655cacf0f91860fba3043f13b64059)
(cherry picked from commit 7940306a47df602be4f57a62175706265bbfd0aa)
| -rw-r--r-- | libavformat/isom.c | 2 | ||||
| -rw-r--r-- | libavformat/mov.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index ccf4ca1e84..c9b894fd15 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -342,7 +342,7 @@ int ff_mov_lang_to_iso639(unsigned code, char to[4]) memset(to, 0, 4); /* is it the mangled iso code? */ /* 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--) { to[i] = 0x60 + (code & 0x1f); code >>= 5; diff --git a/libavformat/mov.c b/libavformat/mov.c index e5d8311fbc..4453d6deff 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -300,7 +300,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); |