[MPlayer-cvslog] r33662 - trunk/mplayer.c

[reimar]

Author: reimar
Date: Sun Jun 19 18:05:35 2011
New Revision: 33662

Log:
Factor out a tiny bit of common code.

Modified:
   trunk/mplayer.c

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Sun Jun 19 17:35:58 2011	(r33661)
+++ trunk/mplayer.c	Sun Jun 19 18:05:35 2011	(r33662)
@@ -1155,6 +1155,7 @@ void update_set_of_subtitles(void)
 
 void init_vo_spudec(void)
 {
+    unsigned width, height;
     spudec_free(vo_spudec);
     vo_spudec = NULL;
 
@@ -1163,17 +1164,20 @@ void init_vo_spudec(void)
         return;
 
     if (spudec_ifo) {
-        unsigned int palette[16], width, height;
+        unsigned int palette[16];
         current_module = "spudec_init_vobsub";
         if (vobsub_parse_ifo(NULL, spudec_ifo, palette, &width, &height, 1, -1, NULL) >= 0)
             vo_spudec = spudec_new_scaled(palette, width, height, NULL, 0);
     }
 
+    width  = mpctx->sh_video->disp_w;
+    height = mpctx->sh_video->disp_h;
+
 #ifdef CONFIG_DVDREAD
     if (vo_spudec == NULL && mpctx->stream->type == STREAMTYPE_DVD) {
         current_module = "spudec_init_dvdread";
         vo_spudec      = spudec_new_scaled(((dvd_priv_t *)(mpctx->stream->priv))->cur_pgc->palette,
-                                           mpctx->sh_video->disp_w, mpctx->sh_video->disp_h,
+                                           width, height,
                                            NULL, 0);
     }
 #endif
@@ -1182,14 +1186,14 @@ void init_vo_spudec(void)
     if (vo_spudec == NULL && mpctx->stream->type == STREAMTYPE_DVDNAV) {
         unsigned int *palette = mp_dvdnav_get_spu_clut(mpctx->stream);
         current_module = "spudec_init_dvdnav";
-        vo_spudec      = spudec_new_scaled(palette, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, NULL, 0);
+        vo_spudec      = spudec_new_scaled(palette, width, height, NULL, 0);
     }
 #endif
 
     if (vo_spudec == NULL) {
         sh_sub_t *sh = mpctx->d_sub->sh;
         current_module = "spudec_init_normal";
-        vo_spudec      = spudec_new_scaled(NULL, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, sh->extradata, sh->extradata_len);
+        vo_spudec      = spudec_new_scaled(NULL, width, height, sh->extradata, sh->extradata_len);
         spudec_set_font_factor(vo_spudec, font_factor);
     }