[FFmpeg-cvslog] ffplay: use decoder avctx for decoded subtitle width/height

Marton Balint git at videolan.org
Sun Oct 2 16:56:46 EEST 2016


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sat Oct  1 18:05:47 2016 +0200| [d14b240ecfc575e2b238d6b47caf1ff764c95b40] | committer: Marton Balint

ffplay: use decoder avctx for decoded subtitle width/height

Fixes ticket #5873.

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d14b240ecfc575e2b238d6b47caf1ff764c95b40
---

 ffplay.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index e64909a..a7a6785 100644
--- 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 */



More information about the ffmpeg-cvslog mailing list