Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2016-10-01 19:05:47 +0300
committerMarton Balint <cus@passwd.hu>2016-10-02 16:40:04 +0300
commitd14b240ecfc575e2b238d6b47caf1ff764c95b40 (patch)
tree7155a5cee46001a6ae6d101df7089c31d13ed26d /ffplay.c
parent42111e8543b18dd50dbdc47d2c8eb0cef23daac0 (diff)
ffplay: use decoder avctx for decoded subtitle width/height
Fixes ticket #5873. Reviewed-by: Josh de Kock <josh@itanimul.li> Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/ffplay.c b/ffplay.c
index e64909a1a0..a7a6785455 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 */