diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
commit | 13221a716588dc88c1151e0a0f8eb7cce41d461c (patch) | |
tree | 3184184f1e984d248e2570ffa05c79589d2c9a1c /stream/stream_dvdnav.c | |
parent | c4f7b9666f753b320157e6497f9114523878885f (diff) | |
parent | bb54613ac1211c73a3614db6b7326d7cd9be39da (diff) | |
download | mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.bz2 mpv-13221a716588dc88c1151e0a0f8eb7cce41d461c.tar.xz |
Merge svn changes up to r30663
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
Diffstat (limited to 'stream/stream_dvdnav.c')
-rw-r--r-- | stream/stream_dvdnav.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index d365301b77..1ce40f5275 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -132,12 +132,10 @@ static dvdnav_priv_t * new_dvdnav_stream(char * filename) { dvdnav_set_readahead_flag(priv->dvdnav, 0); if(dvdnav_set_PGC_positioning_flag(priv->dvdnav, 1) != DVDNAV_STATUS_OK) mp_msg(MSGT_OPEN,MSGL_ERR,"stream_dvdnav, failed to set PGC positioning\n"); -#if 1 /* report the title?! */ if (dvdnav_get_title_string(priv->dvdnav,&title_str)==DVDNAV_STATUS_OK) { mp_msg(MSGT_IDENTIFY, MSGL_INFO,"Title: '%s'\n",title_str); } -#endif //dvdnav_event_clear(priv); |