[SCM] libav/experimental: Read extradata (justification, colors, fonts, etc) for mov/mp4 timed text

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 58e9f2edb6cbb4f97c4a9a48fd086cfec19b6f26
Author: David Conrad <lessen42 at gmail.com>
Date:   Sun Jan 11 08:24:44 2009 +0000

    Read extradata (justification, colors, fonts, etc) for mov/mp4 timed text
    
    Originally committed as revision 16530 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index c0c057a..ed027db 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -977,6 +977,10 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
                 sc->sample_size = (bits_per_sample >> 3) * st->codec->channels;
             }
         } else if(st->codec->codec_type==CODEC_TYPE_SUBTITLE){
+            // ttxt stsd contains display flags, justification, background
+            // color, fonts, and default styles, so fake an atom to read it
+            MOVAtom fake_atom = { .size = size - (url_ftell(pb) - start_pos) };
+            mov_read_glbl(c, pb, fake_atom);
             st->codec->codec_id= id;
         } else {
             /* other codec type, just skip (rtp, mp4s, tmcd ...) */

-- 
Libav/FFmpeg packaging