Mercurial > mplayer.hg

changeset 21926:a8cd73869242

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
at open() assign *file_format=DEMUXER_TYPE_MPEG_PS to avoid useless demuxer probing
author nicodvb
date Tue, 16 Jan 2007 22:38:26 +0000
parents 1c93736b6751
children ee422890bca9
files stream/stream_dvd.c stream/stream_vcd.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/stream/stream_dvd.c	Tue Jan 16 13:28:22 2007 +0000
+++ b/stream/stream_dvd.c	Tue Jan 16 22:38:26 2007 +0000
@@ -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 @@
     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;
--- a/stream/stream_vcd.c	Tue Jan 16 13:28:22 2007 +0000
+++ b/stream/stream_vcd.c	Tue Jan 16 22:38:26 2007 +0000
@@ -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 @@
   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;