Mercurial > mplayer.hg

comparison mplayer.c @ 13092:36701f60f093

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
forgot some ifdef's and broke mplayer.c without ogg & dvdread 1L to me!
author joey
date Sun, 22 Aug 2004 19:34:13 +0000
parents 25f51c72eb06
children 7bcd674b13fb
comparison
equal deleted inserted replaced
13091:25f51c72eb06 13092:36701f60f093
3146 new_id = -1; 3146 new_id = -1;
3147 if(new_id != vobsub_id) 3147 if(new_id != vobsub_id)
3148 osd_show_vobsub_changed = sh_video->fps; 3148 osd_show_vobsub_changed = sh_video->fps;
3149 vobsub_id = new_id; 3149 vobsub_id = new_id;
3150 } 3150 }
3151 #ifdef USE_DVDREAD
3151 if (vo_spudec && stream->type == STREAMTYPE_DVD) 3152 if (vo_spudec && stream->type == STREAMTYPE_DVD)
3152 { 3153 {
3153 int new_id = dvdsub_id + 1; 3154 int new_id = dvdsub_id + 1;
3154 if (dvdsub_id < 0) 3155 if (dvdsub_id < 0)
3155 new_id = 0; 3156 new_id = 0;
3158 if(new_id != dvdsub_id) 3159 if(new_id != dvdsub_id)
3159 osd_show_vobsub_changed = sh_video->fps; 3160 osd_show_vobsub_changed = sh_video->fps;
3160 d_dvdsub->id = dvdsub_id = new_id; 3161 d_dvdsub->id = dvdsub_id = new_id;
3161 spudec_reset(vo_spudec); 3162 spudec_reset(vo_spudec);
3162 } 3163 }
3164 #endif
3165 #ifdef HAVE_OGGVORBIS
3163 if (d_dvdsub && demuxer->type == DEMUXER_TYPE_OGG) 3166 if (d_dvdsub && demuxer->type == DEMUXER_TYPE_OGG)
3164 { 3167 {
3165 int new_id = dvdsub_id + 1; 3168 int new_id = dvdsub_id + 1;
3166 if (dvdsub_id < 0) 3169 if (dvdsub_id < 0)
3167 new_id = 0; 3170 new_id = 0;
3170 if (new_id != dvdsub_id) 3173 if (new_id != dvdsub_id)
3171 osd_show_vobsub_changed = sh_video->fps; 3174 osd_show_vobsub_changed = sh_video->fps;
3172 dvdsub_id = new_id; 3175 dvdsub_id = new_id;
3173 d_dvdsub->id = demux_ogg_sub_id(new_id); 3176 d_dvdsub->id = demux_ogg_sub_id(new_id);
3174 } 3177 }
3178 #endif
3175 break; 3179 break;
3176 case MP_CMD_SUB_FORCED_ONLY: 3180 case MP_CMD_SUB_FORCED_ONLY:
3177 if (vo_spudec) { 3181 if (vo_spudec) {
3178 forced_subs_only = forced_subs_only ? 0 : ~0; // toggle state 3182 forced_subs_only = forced_subs_only ? 0 : ~0; // toggle state
3179 spudec_set_forced_subs_only(vo_spudec,forced_subs_only); 3183 spudec_set_forced_subs_only(vo_spudec,forced_subs_only);