summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorkmkaplan <kmkaplan@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-10-19 01:58:34 +0000
committerkmkaplan <kmkaplan@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-10-19 01:58:34 +0000
commit9fe497ed041985a7560b42b69cff1fd169e5bbf0 (patch)
tree9d505ab7de1fc8614e3d75a7fe4648a0c3a7ded8 /mplayer.c
parente305745f603402ea1e03bcbea765791880b92386 (diff)
downloadmpv-9fe497ed041985a7560b42b69cff1fd169e5bbf0.tar.bz2
mpv-9fe497ed041985a7560b42b69cff1fd169e5bbf0.tar.xz
10L
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7791 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index 8390141274..db4b57933f 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1085,7 +1085,7 @@ if (spudec_ifo) {
unsigned int palette[16], width, height;
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, sh_video->disp_w, sh_video->disp_h);
+ vo_spudec=spudec_new_scaled(palette, width, height);
}
#ifdef USE_DVDNAV
@@ -2209,6 +2209,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
break;
}
case MP_CMD_VOBSUB_LANG:
+ if (vo_vobsub)
{
int new_id = vobsub_id + 1;
if (vobsub_id < 0)
@@ -2590,7 +2591,7 @@ if(rel_seek_secs || abs_seek_pos){
} else
if (osd_show_vobsub_changed) {
const char *language = "none";
- if (vobsub_id >= 0)
+ if (vo_vobsub && vobsub_id >= 0)
language = vobsub_get_id(vo_vobsub, (unsigned int) vobsub_id);
sprintf(osd_text_tmp, "Subtitles: (%d) %s", vobsub_id, language ? language : "unknown");
osd_show_vobsub_changed--;