From e9af8992374c3c7193a0cf1508f4d5f436a56064 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 2 Jun 2013 23:55:21 +0200 Subject: demux: fix "-demuxer mpegps", don't force demuxer in stream_dvd Internally, stream_dvd.c returned DEMUXER_TYPE_MPEG_PS, and the same value was hardcoded to enforced usage of demux_lavf in demux.c. But "-demuxer mpegps" basically did the same, so that switch was broken for this format. Undo this and don't request a demuxer in stream_dvd.c. demux_lavf.c is (probably) good enough to probe correctly with DVD. Otherwise, we'd actually have to do something completely different to force the libavformat demuxer. --- demux/demux.c | 2 +- stream/stream_dvd.c | 1 - 2 files changed, 1 insertion(+), 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; -- cgit v1.2.3