Support VC1 in mpeg-ts

3 files changed, 9 insertions, 3 deletions

diff --git a/tools/ts.c b/tools/ts.c
index 0122e2e9..6f5ef5aa 100644
--- a/tools/ts.c
+++ b/tools/ts.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ts.c,v 1.30 2012-12-31 16:44:27 phintuka Exp $
+ * $Id: ts.c,v 1.31 2013-01-06 21:20:11 phintuka Exp $
  *
  */
 
@@ -409,6 +409,7 @@ int ts_parse_pmt (pmt_data_t *pmt, uint program_no, const uint8_t *pkt)
       case ISO_13818_VIDEO:
       case ISO_14496_PART2_VIDEO:
       case ISO_14496_PART10_VIDEO:
+      case STREAM_VIDEO_VC1:
         LOGPMT("parse_pmt: video pid 0x%.4x type %2.2x", pid, stream[0]);
         if (pmt->video_pid == INVALID_PID) {
           pmt->video_pid  = pid;
diff --git a/tools/ts.h b/tools/ts.h
index 5fccec6b..4eaaa41d 100644
--- a/tools/ts.h
+++ b/tools/ts.h
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ts.h,v 1.17 2010-07-19 13:12:07 phintuka Exp $
+ * $Id: ts.h,v 1.18 2013-01-06 21:20:11 phintuka Exp $
  *
  */
 
@@ -77,6 +77,8 @@ typedef enum {
   STREAM_VIDEO_MPEG      = 0x80,
   STREAM_AUDIO_AC3       = 0x81,
 
+  STREAM_VIDEO_VC1       = 0xea,
+
   /* private streams, payload type detected from PMT stream descriptor tag */
 
   STREAM_AUDIO_EAC3      = 0x7a06, // ISO_13818_PES_PRIVATE | (STREAM_DESCR_EAC3   << 8)
diff --git a/xine/ts2es.c b/xine/ts2es.c
index f80b60b4..9b6c0de0 100644
--- a/xine/ts2es.c
+++ b/xine/ts2es.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ts2es.c,v 1.18 2012-08-30 08:35:20 phintuka Exp $
+ * $Id: ts2es.c,v 1.19 2013-01-06 21:20:11 phintuka Exp $
  *
  */
 
@@ -286,6 +286,9 @@ ts2es_t *ts2es_init(fifo_buffer_t *dst_fifo, ts_stream_type stream_type, uint st
     case ISO_14496_PART10_VIDEO:
       data->xine_buf_type = BUF_VIDEO_H264;
       break;
+    case STREAM_VIDEO_VC1:
+      data->xine_buf_type = BUF_VIDEO_VC1;
+      break;
 
     /* AUDIO (PES streams 0xc0...0xdf) */
     case  ISO_11172_AUDIO: