path: root/stream
diff options
authorwm4 <wm4@nowhere>2013-06-02 23:55:21 +0200
committerwm4 <wm4@nowhere>2013-06-02 23:57:41 +0200
commite9af8992374c3c7193a0cf1508f4d5f436a56064 (patch)
tree2e9a4f251d132bb09a5c4f1095a3fbd46bda05f8 /stream
parent57571b5da3dde82816f5ed7f4371dd7670e55565 (diff)
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.
Diffstat (limited to 'stream')
1 files changed, 0 insertions, 1 deletions
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;