github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-13 00:06:25 +01:00
Code Releases Activity

demux: fix "-demuxer mpegps", don't force demuxer in stream_dvd

Browse Source 
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.
This commit is contained in:
wm4 2013-06-02 23:55:21 +02:00
parent 57571b5da3
commit e9af899237
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demux/demux.c
View File

@ -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 // format, instead of reyling on libav to auto-detect the stream's format
// correctly. // correctly.
switch (file_format) { switch (file_format) {
case DEMUXER_TYPE_MPEG_PS: //case DEMUXER_TYPE_MPEG_PS:
//case DEMUXER_TYPE_MPEG_TS: //case DEMUXER_TYPE_MPEG_TS:
case DEMUXER_TYPE_Y4M: case DEMUXER_TYPE_Y4M:
case DEMUXER_TYPE_NSV: case DEMUXER_TYPE_NSV:

1
stream/stream_dvd.c
View File

@ -1051,7 +1051,6 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
stream->close = stream_dvd_close; stream->close = stream_dvd_close;
stream->start_pos = (int64_t)d->cur_pack*2048; 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; 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); 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; stream->priv = (void*)d;
return STREAM_OK; return STREAM_OK;