summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorjoey <joey@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-22 19:34:13 +0000
committerjoey <joey@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-08-22 19:34:13 +0000
commit22d818c2d5ad34f6afb22dcc74409576ec716788 (patch)
tree51aff00bc8dab4ca617f8be4d2717aa085667674 /mplayer.c
parent896b8f4c2f2ff8793265855017511ccd1ccf6380 (diff)
downloadmpv-22d818c2d5ad34f6afb22dcc74409576ec716788.tar.bz2
mpv-22d818c2d5ad34f6afb22dcc74409576ec716788.tar.xz
forgot some ifdef's and broke mplayer.c without ogg & dvdread
1L to me! git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13093 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index c66c0f41b3..39d89788e7 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3148,6 +3148,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
osd_show_vobsub_changed = sh_video->fps;
vobsub_id = new_id;
}
+#ifdef USE_DVDREAD
if (vo_spudec && stream->type == STREAMTYPE_DVD)
{
int new_id = dvdsub_id + 1;
@@ -3160,6 +3161,8 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
d_dvdsub->id = dvdsub_id = new_id;
spudec_reset(vo_spudec);
}
+#endif
+#ifdef HAVE_OGGVORBIS
if (d_dvdsub && demuxer->type == DEMUXER_TYPE_OGG)
{
int new_id = dvdsub_id + 1;
@@ -3172,6 +3175,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
dvdsub_id = new_id;
d_dvdsub->id = demux_ogg_sub_id(new_id);
}
+#endif
break;
case MP_CMD_SUB_FORCED_ONLY:
if (vo_spudec) {