Mercurial > libavformat.hg

changeset 4976:c236ec233a09 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
export all streams in ts demuxer
author bcoudurier
date Sun, 31 May 2009 00:31:47 +0000
parents 76263311c368
children 586df9be38ad
files mpegts.c
diffstat 1 files changed, 1 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/mpegts.c	Sun May 31 00:24:06 2009 +0000
+++ b/mpegts.c	Sun May 31 00:31:47 2009 +0000
@@ -622,23 +622,6 @@
                stream_type, pid);
 
         /* now create ffmpeg stream */
-        switch(stream_type) {
-        case STREAM_TYPE_AUDIO_MPEG1:
-        case STREAM_TYPE_AUDIO_MPEG2:
-        case STREAM_TYPE_VIDEO_MPEG1:
-        case STREAM_TYPE_VIDEO_MPEG2:
-        case STREAM_TYPE_VIDEO_MPEG4:
-        case STREAM_TYPE_VIDEO_H264:
-        case STREAM_TYPE_VIDEO_VC1:
-        case STREAM_TYPE_VIDEO_DIRAC:
-        case STREAM_TYPE_AUDIO_AAC:
-        case STREAM_TYPE_AUDIO_AC3:
-        case STREAM_TYPE_AUDIO_DTS:
-        case STREAM_TYPE_AUDIO_HDMV_DTS:
-        case STREAM_TYPE_SUBTITLE_DVB:
-            if((stream_type == STREAM_TYPE_AUDIO_HDMV_DTS && !has_hdmv_descr)
-            || (stream_type == STREAM_TYPE_VIDEO_DIRAC    && !has_dirac_descr))
-                break;
             if(ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES){
                 pes= ts->pids[pid]->u.pes_filter.opaque;
                 st= pes->st;
@@ -651,11 +634,6 @@
             add_pid_to_pmt(ts, h->id, pid);
             if(st)
                 av_program_add_stream_index(ts->stream, h->id, st->index);
-            break;
-        default:
-            /* we ignore the other streams */
-            break;
-        }
 
         if (st) {
             if (language[0] != 0) {
@@ -1014,7 +992,7 @@
             codec_type = CODEC_TYPE_AUDIO;
             codec_id = CODEC_ID_AC3;
         } else {
-            codec_type = CODEC_TYPE_VIDEO;
+            codec_type = CODEC_TYPE_DATA;
             codec_id = CODEC_ID_PROBE;
         }
         break;