summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-24 18:08:54 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-24 18:08:54 +0000
commit38f4f0b4cf9858c4bb7806a67ea7ae60c2db25b1 (patch)
treead268d937296552e6a15f970d916d2ff962d8527 /libmpdemux/demuxer.c
parent511946aa0a3fc4afce0379e0ae5d5a8d2eba1754 (diff)
downloadmpv-38f4f0b4cf9858c4bb7806a67ea7ae60c2db25b1.tar.bz2
mpv-38f4f0b4cf9858c4bb7806a67ea7ae60c2db25b1.tar.xz
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
patch by Nico <nsabbi@libero.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10688 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 0000b0f7c5..342fa44e32 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -216,6 +216,7 @@ void free_demuxer(demuxer_t *demuxer){
demux_close_gif(demuxer); break;
#endif
case DEMUXER_TYPE_MPEG_TS:
+ case DEMUXER_TYPE_MPEG4_IN_TS:
demux_close_ts(demuxer); break;
case DEMUXER_TYPE_REALAUDIO:
demux_close_ra(demuxer); break;
@@ -358,7 +359,9 @@ int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){
#ifdef HAVE_GIF
case DEMUXER_TYPE_GIF: return demux_gif_fill_buffer(demux);
#endif
- case DEMUXER_TYPE_MPEG_TS: return demux_ts_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);
}
return 0;
@@ -1259,7 +1262,8 @@ switch(file_format){
break;
}
#endif
- case DEMUXER_TYPE_MPEG_TS: {
+ case DEMUXER_TYPE_MPEG_TS:
+ case DEMUXER_TYPE_MPEG4_IN_TS: {
demux_open_ts(demuxer);
break;
}
@@ -1462,6 +1466,7 @@ 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;
} // switch(demuxer->file_format)
@@ -1533,6 +1538,8 @@ int demux_control(demuxer_t *demuxer, int cmd, void *arg) {
case DEMUXER_TYPE_MPEG4_ES:
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);