summaryrefslogtreecommitdiffstats
path: root/spudec.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-31 21:15:20 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-31 21:15:20 +0000
commitec955f02fd4baab1f38e97c6bc8bfdbe352c917a (patch)
tree737873b978b2d6cd7060b8aa7da367940c488ae8 /spudec.c
parent9be39d06401362f3eb8aa12b22e7fde130defa2b (diff)
downloadmpv-ec955f02fd4baab1f38e97c6bc8bfdbe352c917a.tar.bz2
mpv-ec955f02fd4baab1f38e97c6bc8bfdbe352c917a.tar.xz
Fix subtitle display for http://samples.mplayerhq.hu/sub/largeres_vobsub.mkv
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31295 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'spudec.c')
-rw-r--r--spudec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/spudec.c b/spudec.c
index e4267bf49a..c1fbbf1be8 100644
--- a/spudec.c
+++ b/spudec.c
@@ -1202,11 +1202,15 @@ void *spudec_new_scaled(unsigned int *palette, unsigned int frame_width, unsigne
spudec_parse_extradata(this, extradata, extradata_len);
/* XXX Although the video frame is some size, the SPU frame is
always maximum size i.e. 720 wide and 576 or 480 high */
+ // For HD files in MKV the VobSub resolution can be higher though,
+ // see largeres_vobsub.mkv
+ if (this->orig_frame_width <= 720 && this->orig_frame_height <= 576) {
this->orig_frame_width = 720;
if (this->orig_frame_height == 480 || this->orig_frame_height == 240)
this->orig_frame_height = 480;
else
this->orig_frame_height = 576;
+ }
}
else
mp_msg(MSGT_SPUDEC,MSGL_FATAL, "FATAL: spudec_init: calloc");