diff options
| author | wm4 <wm4@nowhere> | 2012-08-12 18:40:21 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-16 17:17:49 +0200 |
| commit | 41fbcee1f557c3ddbfefc79b2b1b4719c6442265 (patch) | |
| tree | 6c15b7631ad817a68207d2d04e4969ec0e128a8a /stream/stream.c | |
| parent | aebfbbf2bdda8e18beef90c16da97bd335f7d3b0 (diff) | |
| download | mpv-41fbcee1f557c3ddbfefc79b2b1b4719c6442265.tar.bz2 mpv-41fbcee1f557c3ddbfefc79b2b1b4719c6442265.tar.xz | |
Remove dvdnav support (DVD menus)
When the internal mplayer MPEG demuxer was removed (commit 1fde09db),
the default demuxer when using dvdnav was set to libavformat. Now it
turns out that this doesn't work with libavformat. It will terminate
playback right after the audio runs out (instead of looping it like the
video, or whatever it's supposed to do). I'm not sure what exactly the
problem is, but since 1. even mplayer-svn can't handle DVD menus
directly (missing highlights), 2. DVD menus are essentially worthless,
and 3. I don't directly watch DVDs, don't bother with it and remove it.
For basic playback, there's still libdvdread support.
Also, use pkg-config for libdvdread, and drop support for in-tree
libdvdread. Remove support for in-tree libdvdcss as well.
Diffstat (limited to 'stream/stream.c')
| -rw-r--r-- | stream/stream.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/stream/stream.c b/stream/stream.c index d4f0c8ae97..d04b7fb8d8 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -71,7 +71,6 @@ extern const stream_info_t stream_info_radio; extern const stream_info_t stream_info_pvr; extern const stream_info_t stream_info_ftp; extern const stream_info_t stream_info_vstream; -extern const stream_info_t stream_info_dvdnav; extern const stream_info_t stream_info_smb; extern const stream_info_t stream_info_sdp; extern const stream_info_t stream_info_rtsp_sip; @@ -130,9 +129,6 @@ static const stream_info_t* const auto_open_streams[] = { &stream_info_ifo, &stream_info_dvd, #endif -#ifdef CONFIG_DVDNAV - &stream_info_dvdnav, -#endif #ifdef CONFIG_LIBBLURAY &stream_info_bluray, #endif @@ -313,10 +309,6 @@ int stream_read_internal(stream_t *s, void *buf, int len) // do not retry if this looks like proper eof if (s->eof || (s->end_pos && s->pos == s->end_pos)) goto eof_out; - // dvdnav has some horrible hacks to "suspend" reads, - // we need to skip this code or seeks will hang. - if (s->type == STREAMTYPE_DVDNAV) - goto eof_out; // just in case this is an error e.g. due to network // timeout reset and retry |