Mercurial > mplayer.hg

comparison mplayer.c @ 31239:7567de05a9db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation with external libass.
author cehoyos
date Wed, 02 Jun 2010 20:21:29 +0000
parents ee7beb1a3a6e
children ceeed64abf5a
comparison
equal deleted inserted replaced
31238:1aba9097ed7d 31239:7567de05a9db
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 #ifdef CONFIG_ASS 2584 #if defined(CONFIG_ASS_INTERNAL) || defined(LIBASS_VERSION) && LIBASS_VERSION > 0x00909000
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);