@@ -292,7 +292,7 @@ OBJS-$(CONFIG_WEBM_MUXER)                += matroskaenc.o matroska.o \

                                             flacenc_header.o avlanguage.o

 OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood.o

 OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood.o

-OBJS-$(CONFIG_WTV_DEMUXER)               += wtv.o asf.o asfdec.o riff.o

+OBJS-$(CONFIG_WTV_DEMUXER)               += wtv.o asf.o asfdec.o mpegts.o riff.o

 OBJS-$(CONFIG_WV_DEMUXER)                += wv.o apetag.o

 OBJS-$(CONFIG_XA_DEMUXER)                += xa.o

 OBJS-$(CONFIG_YOP_DEMUXER)               += yop.o

@@ -29,6 +29,7 @@

 #include "avformat.h"

 #include "riff.h"

 #include "asf.h"

+#include "mpegts.h"

 /* Macros for formating GUIDs */

 #define PRI_GUID \

@@ -78,6 +79,16 @@ static const ff_asf_guid EVENTID_SubtitleSpanningEvent =

     {0x48,0xC0,0xCE,0x5D,0xB9,0xD0,0x63,0x41,0x87,0x2C,0x4F,0x32,0x22,0x3B,0xE8,0x8A};

 static const ff_asf_guid EVENTID_LanguageSpanningEvent =

     {0x6D,0x66,0x92,0xE2,0x02,0x9C,0x8D,0x44,0xAA,0x8D,0x78,0x1A,0x93,0xFD,0xC3,0x95};

+static const ff_asf_guid EVENTID_AudioDescriptorSpanningEvent =

+    {0x1C,0xD4,0x7B,0x10,0xDA,0xA6,0x91,0x46,0x83,0x69,0x11,0xB2,0xCD,0xAA,0x28,0x8E};

+static const ff_asf_guid EVENTID_CtxADescriptorSpanningEvent =

+    {0xE6,0xA2,0xB4,0x3A,0x47,0x42,0x34,0x4B,0x89,0x6C,0x30,0xAF,0xA5,0xD2,0x1C,0x24};

+static const ff_asf_guid EVENTID_CSDescriptorSpanningEvent =

+    {0xD9,0x79,0xE7,0xEf,0xF0,0x97,0x86,0x47,0x80,0x0D,0x95,0xCF,0x50,0x5D,0xDC,0x66};

+static const ff_asf_guid EVENTID_StreamIDSpanningEvent =

+    {0x68,0xAB,0xF1,0xCA,0x53,0xE1,0x41,0x4D,0xA6,0xB3,0xA7,0xC9,0x98,0xDB,0x75,0xEE};

+static const ff_asf_guid EVENTID_TeletextSpanningEvent =

+    {0x50,0xD9,0x99,0x95,0x33,0x5F,0x17,0x46,0xAF,0x7C,0x1E,0x54,0xB5,0x10,0xDA,0xA3};

 /* Windows media GUIDs */

@@ -307,19 +318,6 @@ static AVStream * parse_media_type(AVFormatContext *s, int sid,

     return NULL;

 }

-/**

- * Read three byte language code

- */

-static void get_language(ByteIOContext *pb, AVStream *st)

-{

-    uint8_t language[4];

-    get_buffer(pb, language, 3);

-    if (language[0]) {

-        language[3] = 0;

-        av_metadata_set2(&st->metadata, "language", language, 0);

-    }

-}

-

 enum {

     SEEK_TO_DATA = 0,

     SEEK_TO_BYTE,

@@ -370,27 +368,43 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p

                     consumed += 72 + size;

                 }

             }

-        } else if (!ff_guidcmp(g, EVENTID_SubtitleSpanningEvent)) {

+        } else if (!ff_guidcmp(g, EVENTID_AudioDescriptorSpanningEvent) ||

+                   !ff_guidcmp(g, EVENTID_CtxADescriptorSpanningEvent) ||

+                   !ff_guidcmp(g, EVENTID_CSDescriptorSpanningEvent) ||

+                   !ff_guidcmp(g, EVENTID_StreamIDSpanningEvent) ||

+                   !ff_guidcmp(g, EVENTID_SubtitleSpanningEvent) ||

+                   !ff_guidcmp(g, EVENTID_TeletextSpanningEvent)) {

             int stream_index = ff_find_stream_index(s, sid);

             if (stream_index >= 0) {

                 AVStream *st = s->streams[stream_index];

+                uint8_t buf[258];

+                const uint8_t *pbuf = buf;

+                int buf_size;

+

+                url_fskip(pb, 8);

+                consumed += 8;

+                if (!ff_guidcmp(g, EVENTID_CtxADescriptorSpanningEvent) ||

+                    !ff_guidcmp(g, EVENTID_CSDescriptorSpanningEvent)) {

+                    url_fskip(pb, 6);

+                    consumed += 6;

+                }

-                url_fskip(pb, 10);

-                get_language(pb, st);

-                url_fskip(pb, 1);

-

-                st->codec->extradata = av_malloc(4);

-                if (!st->codec->extradata)

-                    return AVERROR(ENOMEM);

-                st->codec->extradata_size = get_buffer(pb, st->codec->extradata, 4);

-                consumed += 18;

+                buf_size = FFMIN(len - consumed, sizeof(buf));

+                get_buffer(pb, buf, buf_size);

+                consumed += buf_size;

+                ff_parse_mpeg2_descriptor(s, st, 0, &pbuf, buf + buf_size, 0, 0, 0, 0);

             }

         } else if (!ff_guidcmp(g, EVENTID_LanguageSpanningEvent)) {

             int stream_index = ff_find_stream_index(s, sid);

             if (stream_index >= 0) {

                 AVStream *st = s->streams[stream_index];

+                uint8_t language[4];

                 url_fskip(pb, 12);

-                get_language(pb, st);

+                get_buffer(pb, language, 3);

+                if (language[0]) {

+                    language[3] = 0;

+                    av_metadata_set2(&st->metadata, "language", language, 0);

+                }

                 consumed += 15;

             }

         } else if (!ff_guidcmp(g, timestamp_guid)) {

@@ -419,18 +433,14 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p

             !ff_guidcmp(g, /* DSATTRIB_PicSampleSeq */ (const ff_asf_guid){0x02,0xAE,0x5B,0x2F,0x8F,0x7B,0x60,0x4F,0x82,0xD6,0xE4,0xEA,0x2F,0x1F,0x4C,0x99}) ||

             !ff_guidcmp(g, /* DSATTRIB_TRANSPORT_PROPERTIES */ (const ff_asf_guid){0x12,0xF6,0x22,0xB6,0xAD,0x47,0x71,0x46,0xAD,0x6C,0x05,0xA9,0x8E,0x65,0xDE,0x3A}) ||

             !ff_guidcmp(g, /* dvr_ms_vid_frame_rep_data */ (const ff_asf_guid){0xCC,0x32,0x64,0xDD,0x29,0xE2,0xDB,0x40,0x80,0xF6,0xD2,0x63,0x28,0xD2,0x76,0x1F}) ||

-            !ff_guidcmp(g, /* EVENTID_AudioDescriptorSpanningEvent */ (const ff_asf_guid){0x1C,0xD4,0x7B,0x10,0xDA,0xA6,0x91,0x46,0x83,0x69,0x11,0xB2,0xCD,0xAA,0x28,0x8E}) ||

             !ff_guidcmp(g, /* EVENTID_AudioTypeSpanningEvent */ (const ff_asf_guid){0xBE,0xBF,0x1C,0x50,0x49,0xB8,0xCE,0x42,0x9B,0xE9,0x3D,0xB8,0x69,0xFB,0x82,0xB3}) ||

             !ff_guidcmp(g, /* EVENTID_ChannelChangeSpanningEvent */ (const ff_asf_guid){0xE5,0xC5,0x67,0x90,0x5C,0x4C,0x05,0x42,0x86,0xC8,0x7A,0xFE,0x20,0xFE,0x1E,0xFA}) ||

             !ff_guidcmp(g, /* EVENTID_ChannelInfoSpanningEvent */ (const ff_asf_guid){0x80,0x6D,0xF3,0x41,0x32,0x41,0xC2,0x4C,0xB1,0x21,0x01,0xA4,0x32,0x19,0xD8,0x1B}) ||

             !ff_guidcmp(g, /* EVENTID_ChannelTypeSpanningEvent */ (const ff_asf_guid){0x51,0x1D,0xAB,0x72,0xD2,0x87,0x9B,0x48,0xBA,0x11,0x0E,0x08,0xDC,0x21,0x02,0x43}) ||

-            !ff_guidcmp(g, /* EVENTID_CtxADescriptorSpanningEvent */ (const ff_asf_guid){0xE6,0xA2,0xB4,0x3A,0x47,0x42,0x34,0x4B,0x89,0x6C,0x30,0xAF,0xA5,0xD2,0x1C,0x24}) ||

             !ff_guidcmp(g, /* EVENTID_DVBScramblingControlSpanningEvent */ (const ff_asf_guid){0xC4,0xE1,0xD4,0x4B,0xA1,0x90,0x09,0x41,0x82,0x36,0x27,0xF0,0x0E,0x7D,0xCC,0x5B}) ||

             !ff_guidcmp(g, /* EVENTID_PIDListSpanningEvent */ (const ff_asf_guid){0x65,0x8F,0xFC,0x47,0xBB,0xE2,0x34,0x46,0x9C,0xEF,0xFD,0xBF,0xE6,0x26,0x1D,0x5C}) ||

             !ff_guidcmp(g, /* EVENTID_SignalAndServiceStatusSpanningEvent */ (const ff_asf_guid){0xCB,0xC5,0x68,0x80,0x04,0x3C,0x2B,0x49,0xB4,0x7D,0x03,0x08,0x82,0x0D,0xCE,0x51}) ||

-            !ff_guidcmp(g, /* EVENTID_StreamIDSpanningEvent */ (const ff_asf_guid){0x68,0xAB,0xF1,0xCA,0x53,0xE1,0x41,0x4D,0xA6,0xB3,0xA7,0xC9,0x98,0xDB,0x75,0xEE}) ||

             !ff_guidcmp(g, /* EVENTID_StreamTypeSpanningEvent */ (const ff_asf_guid){0xBC,0x2E,0xAF,0x82,0xA6,0x30,0x64,0x42,0xA8,0x0B,0xAD,0x2E,0x13,0x72,0xAC,0x60}) ||

-            !ff_guidcmp(g, /* EVENTID_TeletextSpanningEvent */ (const ff_asf_guid){0x50,0xD9,0x99,0x95,0x33,0x5F,0x17,0x46,0xAF,0x7C,0x1E,0x54,0xB5,0x10,0xDA,0xA3}) ||

             !ff_guidcmp(g, (const ff_asf_guid){0x1E,0xBE,0xC3,0xC5,0x43,0x92,0xDC,0x11,0x85,0xE5,0x00,0x12,0x3F,0x6F,0x73,0xB9}) ||

             !ff_guidcmp(g, (const ff_asf_guid){0x3B,0x86,0xA2,0xB1,0xEB,0x1E,0xC3,0x44,0x8C,0x88,0x1C,0xA3,0xFF,0xE3,0xE7,0x6A}) ||

             !ff_guidcmp(g, (const ff_asf_guid){0x4E,0x7F,0x4C,0x5B,0xC4,0xD0,0x38,0x4B,0xA8,0x3E,0x21,0x7F,0x7B,0xBF,0x52,0xE7}) ||