OSDN Git Service

ffplay: use decoder avctx for decoded subtitle width/height
authorMarton Balint <cus@passwd.hu>
Sat, 1 Oct 2016 16:05:47 +0000 (18:05 +0200)
committerMarton Balint <cus@passwd.hu>
Sun, 2 Oct 2016 13:40:04 +0000 (15:40 +0200)
Fixes ticket #5873.

Reviewed-by: Josh de Kock <josh@itanimul.li>
Signed-off-by: Marton Balint <cus@passwd.hu>
ffplay.c

index e64909a..a7a6785 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -2224,7 +2224,6 @@ static int video_thread(void *arg)
 static int subtitle_thread(void *arg)
 {
     VideoState *is = arg;
-    AVCodecParameters *codecpar = is->subtitle_st->codecpar;
     Frame *sp;
     int got_subtitle;
     double pts;
@@ -2243,8 +2242,8 @@ static int subtitle_thread(void *arg)
                 pts = sp->sub.pts / (double)AV_TIME_BASE;
             sp->pts = pts;
             sp->serial = is->subdec.pkt_serial;
-            sp->width = codecpar->width;
-            sp->height = codecpar->height;
+            sp->width = is->subdec.avctx->width;
+            sp->height = is->subdec.avctx->height;
             sp->uploaded = 0;
 
             /* now we can update the picture count */