Mercurial > mplayer.hg
diff libmpdemux/demuxer.c @ 14034:7ac60a1c576e
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
| author | nicodvb |
|---|---|
| date | Wed, 24 Nov 2004 18:55:03 +0000 |
| parents | e632b43f0598 |
| children | 4802041ab8e3 |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Wed Nov 24 17:35:39 2004 +0000 +++ b/libmpdemux/demuxer.c Wed Nov 24 18:55:03 2004 +0000 @@ -231,7 +231,6 @@ case DEMUXER_TYPE_LMLM4: demux_close_lmlm4(demuxer); break; case DEMUXER_TYPE_MPEG_TS: - case DEMUXER_TYPE_MPEG4_IN_TS: demux_close_ts(demuxer); break; case DEMUXER_TYPE_MPEG_PS: demux_close_mpg(demuxer); break; @@ -386,7 +385,6 @@ #endif case DEMUXER_TYPE_LMLM4: return demux_lmlm4_fill_buffer(demux); case DEMUXER_TYPE_MPEG_TS: - case DEMUXER_TYPE_MPEG4_IN_TS: return demux_ts_fill_buffer(demux); case DEMUXER_TYPE_REALAUDIO: return demux_ra_fill_buffer(demux); #ifdef USE_LIBAVFORMAT @@ -1363,8 +1361,7 @@ break; } #endif - case DEMUXER_TYPE_MPEG_TS: - case DEMUXER_TYPE_MPEG4_IN_TS: { + case DEMUXER_TYPE_MPEG_TS: { demux_open_ts(demuxer); break; } @@ -1586,7 +1583,6 @@ demux_mkv_seek(demuxer,rel_seek_secs,flags); break; #endif case DEMUXER_TYPE_MPEG_TS: - case DEMUXER_TYPE_MPEG4_IN_TS: demux_seek_ts(demuxer,rel_seek_secs,flags); break; #ifdef USE_LIBAVFORMAT case DEMUXER_TYPE_LAVF: @@ -1667,7 +1663,6 @@ case DEMUXER_TYPE_MPEG_ES: case DEMUXER_TYPE_MPEG_PS: case DEMUXER_TYPE_MPEG_TS: - case DEMUXER_TYPE_MPEG4_IN_TS: return demux_mpg_control(demuxer,cmd,arg); case DEMUXER_TYPE_ASF: return demux_asf_control(demuxer,cmd,arg);