Mercurial > mplayer.hg

comparison mplayer.c @ 31243:ceeed64abf5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify libass version check.
author cehoyos
date Thu, 03 Jun 2010 08:17:51 +0000
parents 7567de05a9db
children a3adde0a5b83
comparison
equal deleted inserted replaced
31242:1f4cf4c05e83 31243:ceeed64abf5a
2579 if (vo_vobsub && mpctx->sh_video) { 2579 if (vo_vobsub && mpctx->sh_video) {
2580 current_module = "seek_vobsub_reset"; 2580 current_module = "seek_vobsub_reset";
2581 vobsub_seek(vo_vobsub, mpctx->sh_video->pts); 2581 vobsub_seek(vo_vobsub, mpctx->sh_video->pts);
2582 } 2582 }
2583 2583
2584 #if defined(CONFIG_ASS_INTERNAL) || defined(LIBASS_VERSION) && LIBASS_VERSION > 0x00909000 2584 #if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00910000
2585 if (ass_enabled && mpctx->d_sub->sh && ((sh_sub_t *)mpctx->d_sub->sh)->ass_track) 2585 if (ass_enabled && mpctx->d_sub->sh && ((sh_sub_t *)mpctx->d_sub->sh)->ass_track)
2586 ass_flush_events(((sh_sub_t *)mpctx->d_sub->sh)->ass_track); 2586 ass_flush_events(((sh_sub_t *)mpctx->d_sub->sh)->ass_track);
2587 #endif 2587 #endif
2588 2588
2589 edl_seek_reset(mpctx); 2589 edl_seek_reset(mpctx);