Commit 65c10746 authored by nicodvb's avatar nicodvb

demux VC1 in mpegts

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7902 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent d6237e2e
...@@ -503,6 +503,7 @@ static void pmt_cb(void *opaque, const uint8_t *section, int section_len) ...@@ -503,6 +503,7 @@ static void pmt_cb(void *opaque, const uint8_t *section, int section_len)
case STREAM_TYPE_VIDEO_MPEG2: case STREAM_TYPE_VIDEO_MPEG2:
case STREAM_TYPE_VIDEO_MPEG4: case STREAM_TYPE_VIDEO_MPEG4:
case STREAM_TYPE_VIDEO_H264: case STREAM_TYPE_VIDEO_H264:
case STREAM_TYPE_VIDEO_VC1:
case STREAM_TYPE_AUDIO_AAC: case STREAM_TYPE_AUDIO_AAC:
case STREAM_TYPE_AUDIO_AC3: case STREAM_TYPE_AUDIO_AC3:
case STREAM_TYPE_AUDIO_DTS: case STREAM_TYPE_AUDIO_DTS:
...@@ -813,7 +814,7 @@ static void mpegts_push_data(void *opaque, ...@@ -813,7 +814,7 @@ static void mpegts_push_data(void *opaque,
code = pes->header[3] | 0x100; code = pes->header[3] | 0x100;
if (!((code >= 0x1c0 && code <= 0x1df) || if (!((code >= 0x1c0 && code <= 0x1df) ||
(code >= 0x1e0 && code <= 0x1ef) || (code >= 0x1e0 && code <= 0x1ef) ||
(code == 0x1bd))) (code == 0x1bd) || (code == 0x1fd)))
goto skip; goto skip;
if (!pes->st) { if (!pes->st) {
/* allocate stream */ /* allocate stream */
...@@ -921,6 +922,10 @@ static AVStream* new_pes_av_stream(PESContext *pes, uint32_t code) ...@@ -921,6 +922,10 @@ static AVStream* new_pes_av_stream(PESContext *pes, uint32_t code)
codec_type = CODEC_TYPE_VIDEO; codec_type = CODEC_TYPE_VIDEO;
codec_id = CODEC_ID_H264; codec_id = CODEC_ID_H264;
break; break;
case STREAM_TYPE_VIDEO_VC1:
codec_type = CODEC_TYPE_VIDEO;
codec_id = CODEC_ID_VC1;
break;
case STREAM_TYPE_AUDIO_AAC: case STREAM_TYPE_AUDIO_AAC:
codec_type = CODEC_TYPE_AUDIO; codec_type = CODEC_TYPE_AUDIO;
codec_id = CODEC_ID_AAC; codec_id = CODEC_ID_AAC;
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#define STREAM_TYPE_AUDIO_AAC 0x0f #define STREAM_TYPE_AUDIO_AAC 0x0f
#define STREAM_TYPE_VIDEO_MPEG4 0x10 #define STREAM_TYPE_VIDEO_MPEG4 0x10
#define STREAM_TYPE_VIDEO_H264 0x1b #define STREAM_TYPE_VIDEO_H264 0x1b
#define STREAM_TYPE_VIDEO_VC1 0xea
#define STREAM_TYPE_AUDIO_AC3 0x81 #define STREAM_TYPE_AUDIO_AC3 0x81
#define STREAM_TYPE_AUDIO_DTS 0x8a #define STREAM_TYPE_AUDIO_DTS 0x8a
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment