# HG changeset patch # User nicodvb # Date 1171053264 0 # Node ID 814fbf5732eb03c82769b0a091b3f121dc1b171b # Parent 4b8313d5b23b934ce84d82c64a632ab5d67943ac demux VC1 in mpegts diff -r 4b8313d5b23b -r 814fbf5732eb mpegts.c --- a/mpegts.c Fri Feb 09 12:10:15 2007 +0000 +++ b/mpegts.c Fri Feb 09 20:34:24 2007 +0000 @@ -503,6 +503,7 @@ case STREAM_TYPE_VIDEO_MPEG2: case STREAM_TYPE_VIDEO_MPEG4: case STREAM_TYPE_VIDEO_H264: + case STREAM_TYPE_VIDEO_VC1: case STREAM_TYPE_AUDIO_AAC: case STREAM_TYPE_AUDIO_AC3: case STREAM_TYPE_AUDIO_DTS: @@ -813,7 +814,7 @@ code = pes->header[3] | 0x100; if (!((code >= 0x1c0 && code <= 0x1df) || (code >= 0x1e0 && code <= 0x1ef) || - (code == 0x1bd))) + (code == 0x1bd) || (code == 0x1fd))) goto skip; if (!pes->st) { /* allocate stream */ @@ -921,6 +922,10 @@ codec_type = CODEC_TYPE_VIDEO; codec_id = CODEC_ID_H264; break; + case STREAM_TYPE_VIDEO_VC1: + codec_type = CODEC_TYPE_VIDEO; + codec_id = CODEC_ID_VC1; + break; case STREAM_TYPE_AUDIO_AAC: codec_type = CODEC_TYPE_AUDIO; codec_id = CODEC_ID_AAC; diff -r 4b8313d5b23b -r 814fbf5732eb mpegts.h --- a/mpegts.h Fri Feb 09 12:10:15 2007 +0000 +++ b/mpegts.h Fri Feb 09 20:34:24 2007 +0000 @@ -46,6 +46,7 @@ #define STREAM_TYPE_AUDIO_AAC 0x0f #define STREAM_TYPE_VIDEO_MPEG4 0x10 #define STREAM_TYPE_VIDEO_H264 0x1b +#define STREAM_TYPE_VIDEO_VC1 0xea #define STREAM_TYPE_AUDIO_AC3 0x81 #define STREAM_TYPE_AUDIO_DTS 0x8a