From ef7ae1b8e8ac2255e70c80cbfff906d45e956761 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 21 Aug 2010 11:54:04 +0000 Subject: av_sub: Pass video dimensions specified in subtitle to spudec Makes DVD-resolution PGS subs work correctly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32005 b3059339-0415-0410-9bf9-f77b7e298cf2 --- av_sub.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/av_sub.c b/av_sub.c index bada534024..aadba94fd4 100644 --- a/av_sub.c +++ b/av_sub.c @@ -39,7 +39,6 @@ int decode_avsub(struct sh_sub *sh, uint8_t **data, int *size, double *pts, doub { AVCodecContext *ctx = sh->context; enum CodecID cid = CODEC_ID_NONE; - int srcw = 0, srch = 0; int new_type = 0; int res; int got_sub; @@ -50,7 +49,6 @@ int decode_avsub(struct sh_sub *sh, uint8_t **data, int *size, double *pts, doub case 'b': cid = CODEC_ID_DVB_SUBTITLE; break; case 'p': - srcw = 1920; srch = 1080; cid = CODEC_ID_HDMV_PGS_SUBTITLE; break; case 'x': cid = CODEC_ID_XSUB; break; @@ -87,7 +85,7 @@ int decode_avsub(struct sh_sub *sh, uint8_t **data, int *size, double *pts, doub switch (sub.rects[0]->type) { case SUBTITLE_BITMAP: if (!vo_spudec) - vo_spudec = spudec_new_scaled(NULL, srcw, srch, NULL, 0); + vo_spudec = spudec_new_scaled(NULL, ctx->width, ctx->height, NULL, 0); spudec_set_paletted(vo_spudec, sub.rects[0]->pict.data[0], sub.rects[0]->pict.linesize[0], -- cgit v1.2.3