Mercurial > libavformat.hg

changeset 1774:814fbf5732eb libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
demux VC1 in mpegts
author nicodvb
date Fri, 09 Feb 2007 20:34:24 +0000
parents 4b8313d5b23b
children 3562fd629c37
files mpegts.c mpegts.h
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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