[SCM] libav/experimental: partial support for vobsub in mp4, used by nero, unsupported-embedded-subs-2.mp4

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8cb976931a9f85472ce595d77e5bd459f25e8817
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Tue Nov 14 01:05:31 2006 +0000

    partial support for vobsub in mp4, used by nero, unsupported-embedded-subs-2.mp4
    
    Originally committed as revision 7032 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7f25bd9..3ceac64 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -414,6 +414,10 @@ static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
         st->codec->codec_type = CODEC_TYPE_AUDIO;
     else if(type == MKTAG('m', '1', 'a', ' '))
         st->codec->codec_id = CODEC_ID_MP2;
+    else if(type == MKTAG('s', 'u', 'b', 'p')) {
+        st->codec->codec_type = CODEC_TYPE_SUBTITLE;
+        st->codec->codec_id = CODEC_ID_DVD_SUBTITLE;
+    }
     get_be32(pb); /* component  manufacture */
     get_be32(pb); /* component flags */
     get_be32(pb); /* component flags mask */

-- 
Libav/FFmpeg packaging