Mercurial > mplayer.hg
diff libmpdemux/demuxer.c @ 10687:f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
patch by Nico <nsabbi@libero.it>
| author | arpi |
|---|---|
| date | Sun, 24 Aug 2003 18:08:54 +0000 |
| parents | dd2572331142 |
| children | e46e5a6c53b8 |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Sun Aug 24 18:07:00 2003 +0000 +++ b/libmpdemux/demuxer.c Sun Aug 24 18:08:54 2003 +0000 @@ -216,6 +216,7 @@ 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 @@ #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 @@ 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 @@ 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 @@ 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);