1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-21 10:51:51 +00:00

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
This commit is contained in:
joey 2004-08-22 19:34:13 +00:00
parent 896b8f4c2f
commit 22d818c2d5

View File

@ -3148,6 +3148,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
osd_show_vobsub_changed = sh_video->fps; osd_show_vobsub_changed = sh_video->fps;
vobsub_id = new_id; vobsub_id = new_id;
} }
#ifdef USE_DVDREAD
if (vo_spudec && stream->type == STREAMTYPE_DVD) if (vo_spudec && stream->type == STREAMTYPE_DVD)
{ {
int new_id = dvdsub_id + 1; 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; d_dvdsub->id = dvdsub_id = new_id;
spudec_reset(vo_spudec); spudec_reset(vo_spudec);
} }
#endif
#ifdef HAVE_OGGVORBIS
if (d_dvdsub && demuxer->type == DEMUXER_TYPE_OGG) if (d_dvdsub && demuxer->type == DEMUXER_TYPE_OGG)
{ {
int new_id = dvdsub_id + 1; int new_id = dvdsub_id + 1;
@ -3172,6 +3175,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
dvdsub_id = new_id; dvdsub_id = new_id;
d_dvdsub->id = demux_ogg_sub_id(new_id); d_dvdsub->id = demux_ogg_sub_id(new_id);
} }
#endif
break; break;
case MP_CMD_SUB_FORCED_ONLY: case MP_CMD_SUB_FORCED_ONLY:
if (vo_spudec) { if (vo_spudec) {