diff options
author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-16 22:38:26 +0000 |
---|---|---|
committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-16 22:38:26 +0000 |
commit | 1e93b37a87b9735ebb4d2596c7c46cedb0608b19 (patch) | |
tree | 175e4f6d50bbcad648a057f05ee7475ce8a26c98 /stream | |
parent | f4738068b0b23ced2f9c7e9c131c327bad888cdf (diff) | |
download | mpv-1e93b37a87b9735ebb4d2596c7c46cedb0608b19.tar.bz2 mpv-1e93b37a87b9735ebb4d2596c7c46cedb0608b19.tar.xz |
at open() assign *file_format=DEMUXER_TYPE_MPEG_PS to avoid useless demuxer probing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21944 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r-- | stream/stream_dvd.c | 2 | ||||
-rw-r--r-- | stream/stream_vcd.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index 58b32bcadf..b07f6feaa1 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -34,6 +34,7 @@ #include "m_struct.h" #include "stream_dvd.h" +#include "libmpdemux/demuxer.h" extern int stream_cache_size; /// We keep these 2 for the gui atm, but they will be removed. @@ -1113,6 +1114,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { stream->close = stream_dvd_close; stream->start_pos = (off_t)d->cur_pack*2048; stream->end_pos = (off_t)(d->cur_pgc->cell_playback[d->last_cell-1].last_sector)*2048; + *file_format = DEMUXER_TYPE_MPEG_PS; mp_msg(MSGT_DVD,MSGL_V,"DVD start=%d end=%d \n",d->cur_pack,d->cur_pgc->cell_playback[d->last_cell-1].last_sector); stream->priv = (void*)d; return STREAM_OK; diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c index 9af85ce2e8..bb08a3e18c 100644 --- a/stream/stream_vcd.c +++ b/stream/stream_vcd.c @@ -24,6 +24,8 @@ #include "vcd_read.h" #endif +#include "libmpdemux/demuxer.h" + extern char *cdrom_device; static struct stream_priv_s { @@ -135,6 +137,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { stream->fill_buffer = fill_buffer; stream->seek = seek; stream->close = close_s; + *file_format = DEMUXER_TYPE_MPEG_PS; m_struct_free(&stream_opts,opts); return STREAM_OK; |