[SCM] libav/experimental: Hack to support XSUB subtitles in AVI

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit cbb79c0ea858c1114806a762c06a10c5e8b5561e
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Sun Aug 5 12:11:16 2007 +0000

    Hack to support XSUB subtitles in AVI
    
    Originally committed as revision 9936 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 53621c5..f428fab 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -412,6 +412,13 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
                     get_le32(pb); /* ClrUsed */
                     get_le32(pb); /* ClrImportant */
 
+                    if (tag1 == MKTAG('D', 'X', 'S', 'B')) {
+                        st->codec->codec_type = CODEC_TYPE_SUBTITLE;
+                        st->codec->codec_tag = tag1;
+                        st->codec->codec_id = CODEC_ID_XSUB;
+                        break;
+                    }
+
                     if(size > 10*4 && size<(1<<30)){
                         st->codec->extradata_size= size - 10*4;
                         st->codec->extradata= av_malloc(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);

-- 
Libav/FFmpeg packaging