Mercurial > mplayer.hg

comparison command.c @ 29853:415169f556ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid modifying dvdsub_id in command.c where possible.
author reimar
date Wed, 11 Nov 2009 11:09:36 +0000
parents b33846197f5c
children eeb60773d668
comparison
equal deleted inserted replaced
29852:32d288088a0f 29853:415169f556ed
1496 #ifdef CONFIG_DVDREAD 1496 #ifdef CONFIG_DVDREAD
1497 if (vo_spudec 1497 if (vo_spudec
1498 && (mpctx->stream->type == STREAMTYPE_DVD 1498 && (mpctx->stream->type == STREAMTYPE_DVD
1499 || mpctx->stream->type == STREAMTYPE_DVDNAV) 1499 || mpctx->stream->type == STREAMTYPE_DVDNAV)
1500 && dvdsub_id < 0 && reset_spu) { 1500 && dvdsub_id < 0 && reset_spu) {
1501 dvdsub_id = -2; 1501 d_sub->id = -2;
1502 d_sub->id = dvdsub_id; 1502 d_sub->sh = NULL;
1503 } 1503 }
1504 #endif 1504 #endif
1505 if (mpctx->sh_audio) 1505 if (mpctx->sh_audio)
1506 pts = mpctx->sh_audio->pts; 1506 pts = mpctx->sh_audio->pts;
1507 if (mpctx->sh_video) 1507 if (mpctx->sh_video)