mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

av_sub: Pass video dimensions specified in subtitle to spudec

Browse Source 
Makes DVD-resolution PGS subs work correctly.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32005 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-08-21 11:54:04 +00:00 committed by Uoti Urpala
parent a4e62de5dc
commit ef7ae1b8e8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
av_sub.c
View File

@ -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],