aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Stebbins <stebbins@jetheaddev.com>2011-01-26 05:15:49 +0000
committerMichael Niedermayer <michaelni@gmx.at>2011-01-28 03:15:35 +0100
commit2f7d8977bcdeb2c39fd9acbd753d605298824db8 (patch)
tree408c1bcc45f3516201b9cebd970dea6652996620
parent9653e754a4a179e0536e081782636a8249f1ea91 (diff)
downloadffmpeg-2f7d8977bcdeb2c39fd9acbd753d605298824db8.tar.gz
mov: add support for little-endian utf16 chapter names
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 97b04f5ed3ab3a62e57f0c16841fb8f10d0a174c)
-rw-r--r--libavformat/mov.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index ea9423ba7b..7ad920fcb1 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2326,6 +2326,8 @@ static void mov_read_chapters(AVFormatContext *s)
ch = get_be16(sc->pb);
if (ch == 0xfeff)
avio_get_str16be(sc->pb, len, title, title_len);
+ else if (ch == 0xfffe)
+ avio_get_str16le(sc->pb, len, title, title_len);
else {
AV_WB16(title, ch);
get_strz(sc->pb, title + 2, len - 1);