From 97293969b40797442ec0f612b89a89ace8804561 Mon Sep 17 00:00:00 2001 From: aurel Date: Mon, 27 Oct 2008 22:51:22 +0000 Subject: Factorize vobsub idx/extradata handling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27841 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mencoder.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'mencoder.c') diff --git a/mencoder.c b/mencoder.c index bc378673f2..f0105fe421 100644 --- a/mencoder.c +++ b/mencoder.c @@ -738,19 +738,16 @@ else { if (spudec_ifo) { unsigned int palette[16], width, height; if (vobsub_parse_ifo(NULL,spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0) - vo_spudec=spudec_new_scaled(palette, sh_video->disp_w, sh_video->disp_h); + vo_spudec=spudec_new_scaled(palette, sh_video->disp_w, sh_video->disp_h, NULL, 0); } #ifdef CONFIG_DVDREAD if (vo_spudec==NULL) { vo_spudec=spudec_new_scaled(stream->type==STREAMTYPE_DVD?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL, - sh_video->disp_w, sh_video->disp_h); + sh_video->disp_w, sh_video->disp_h, NULL, 0); } #endif } -// Apply current settings for forced subs -spudec_set_forced_subs_only(vo_spudec,forced_subs_only); - ostream = open_output_stream(out_filename, 0); if(!ostream) { mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_CannotOpenOutputFile, out_filename); -- cgit v1.2.3