# HG changeset patch # User joey # Date 1093203253 0 # Node ID 36701f60f093d78cd3bc0cc425054f714447fe57 # Parent 25f51c72eb06551a6ee5ca77548854c114619bf3 forgot some ifdef's and broke mplayer.c without ogg & dvdread 1L to me! diff -r 25f51c72eb06 -r 36701f60f093 mplayer.c --- a/mplayer.c Sun Aug 22 19:01:56 2004 +0000 +++ b/mplayer.c Sun Aug 22 19:34:13 2004 +0000 @@ -3148,6 +3148,7 @@ 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 @@ 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 @@ dvdsub_id = new_id; d_dvdsub->id = demux_ogg_sub_id(new_id); } +#endif break; case MP_CMD_SUB_FORCED_ONLY: if (vo_spudec) {