summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--demux/demux.c2
-rw-r--r--stream/stream_dvd.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/demux/demux.c b/demux/demux.c
index 3e27b43f93..ed74540a7d 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -987,7 +987,7 @@ struct demuxer *demux_open_withparams(struct MPOpts *opts,
// format, instead of reyling on libav to auto-detect the stream's format
// correctly.
switch (file_format) {
- case DEMUXER_TYPE_MPEG_PS:
+ //case DEMUXER_TYPE_MPEG_PS:
//case DEMUXER_TYPE_MPEG_TS:
case DEMUXER_TYPE_Y4M:
case DEMUXER_TYPE_NSV:
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index dc2cdfd2ae..aa113667fd 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -1051,7 +1051,6 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
stream->close = stream_dvd_close;
stream->start_pos = (int64_t)d->cur_pack*2048;
stream->end_pos = (int64_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;