[SCM] libav/experimental: Revert "mov: simplify mov_read_chapters() by using avio_get_str16be"

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c4f8765ac55562fc6ab705e3d17275b69eb5f71d
Author: Mans Rullgard <mans at mansr.com>
Date:   Wed Jan 26 21:54:42 2011 +0000

    Revert "mov: simplify mov_read_chapters() by using avio_get_str16be"
    
    This reverts commit c34461b35b68ff1f3d04540e0279383c51be8cee.
    The wrong version of the patch was committed.

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 40666c1..4370b48 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2283,7 +2283,8 @@ static void mov_read_chapters(AVFormatContext *s)
     AVStream *st = NULL;
     MOVStreamContext *sc;
     int64_t cur_pos;
-    int i;
+    uint8_t *title = NULL;
+    int i, len, i8, i16;
 
     for (i = 0; i < s->nb_streams; i++)
         if (s->streams[i]->id == mov->chapter_track) {
@@ -2302,33 +2303,43 @@ static void mov_read_chapters(AVFormatContext *s)
     for (i = 0; i < st->nb_index_entries; i++) {
         AVIndexEntry *sample = &st->index_entries[i];
         int64_t end = i+1 < st->nb_index_entries ? st->index_entries[i+1].timestamp : st->duration;
-        uint8_t title[512];
-        uint16_t ch;
-        int len;
 
         if (url_fseek(sc->pb, sample->pos, SEEK_SET) != sample->pos) {
             av_log(s, AV_LOG_ERROR, "Chapter %d not found in file\n", i);
             goto finish;
         }
 
+        title = av_malloc(sample->size+2);
+        get_buffer(sc->pb, title, sample->size);
+
         // the first two bytes are the length of the title
-        len = get_be16(sc->pb);
+        len = AV_RB16(title);
         if (len > sample->size-2)
             continue;
 
         // The samples could theoretically be in any encoding if there's an encd
         // atom following, but in practice are only utf-8 or utf-16, distinguished
         // instead by the presence of a BOM
-        if ((ch = get_be16(sc->pb)) == 0xfeff)
-            avio_get_str16be(sc->pb, len, title, sizeof(title));
-        else {
-            AV_WB16(title, ch);
-            get_buffer(sc->pb, title + sizeof(ch), sizeof(title) - sizeof(ch));
+        if (AV_RB16(title+2) == 0xfeff) {
+            uint8_t *utf8 = av_malloc(2*len+3);
+
+            i8 = i16 = 0;
+            while (i16 < len) {
+                uint32_t ch;
+                uint8_t tmp;
+                GET_UTF16(ch, i16 < len ? AV_RB16(title + (i16+=2)) : 0, break;)
+                PUT_UTF8(ch, tmp, if (i8 < 2*len) utf8[2+i8++] = tmp;)
+            }
+            utf8[2+i8] = 0;
+            av_freep(&title);
+            title = utf8;
         }
 
-        ff_new_chapter(s, i, st->time_base, sample->timestamp, end, title);
+        ff_new_chapter(s, i, st->time_base, sample->timestamp, end, title+2);
+        av_freep(&title);
     }
 finish:
+    av_free(title);
     url_fseek(sc->pb, cur_pos, SEEK_SET);
 }
 

-- 
Libav/FFmpeg packaging