diff options
| author | wm4 <wm4@nowhere> | 2013-06-02 23:55:21 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-06-02 23:57:41 +0200 |
| commit | e9af8992374c3c7193a0cf1508f4d5f436a56064 (patch) | |
| tree | 2e9a4f251d132bb09a5c4f1095a3fbd46bda05f8 /demux | |
| parent | 57571b5da3dde82816f5ed7f4371dd7670e55565 (diff) | |
| download | mpv-e9af8992374c3c7193a0cf1508f4d5f436a56064.tar.bz2 mpv-e9af8992374c3c7193a0cf1508f4d5f436a56064.tar.xz | |
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 'demux')
| -rw-r--r-- | demux/demux.c | 2 |
1 files changed, 1 insertions, 1 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: |