diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-11-24 18:55:03 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-11-24 18:55:03 +0000 |
| commit | 939cfe134118da389a5050c89f5575935f94ae8f (patch) | |
| tree | b5335db368ebe36e049dfb3ecf84d544c2767ac3 /libmpdemux/demuxer.c | |
| parent | 8f722ca9d8e37cefb1e804aeb18b48da5880ef2f (diff) | |
| download | mpv-939cfe134118da389a5050c89f5575935f94ae8f.tar.bz2 mpv-939cfe134118da389a5050c89f5575935f94ae8f.tar.xz | |
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14035 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 2f80ba4055..43484d1086 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -231,7 +231,6 @@ void free_demuxer(demuxer_t *demuxer){ 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 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ #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 @@ switch(file_format){ 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 @@ switch(demuxer->file_format){ 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 @@ int demux_control(demuxer_t *demuxer, int cmd, void *arg) { 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); |