diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-15 17:28:21 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-15 17:41:48 +0200 |
commit | 4ada49f9dbed6ab1a84cf2d79f0e8b5e549b0b6a (patch) | |
tree | 2b297b3e8d5b2051137d21b2c398f43d5ba2dcfc /ffmpeg.c | |
parent | bd5d11d9f5fdfb5d639a182a97b84ae08af16fc0 (diff) | |
download | ffmpeg-4ada49f9dbed6ab1a84cf2d79f0e8b5e549b0b6a.tar.gz |
ffmpeg: Use the decoders dimensions in sub2video_get_blank_frame()
Fixes Ticket4744 part3
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -172,8 +172,8 @@ static int sub2video_get_blank_frame(InputStream *ist) AVFrame *frame = ist->sub2video.frame; av_frame_unref(frame); - ist->sub2video.frame->width = ist->sub2video.w; - ist->sub2video.frame->height = ist->sub2video.h; + ist->sub2video.frame->width = ist->dec_ctx->width ? ist->dec_ctx->width : ist->sub2video.w; + ist->sub2video.frame->height = ist->dec_ctx->height ? ist->dec_ctx->height : ist->sub2video.h; ist->sub2video.frame->format = AV_PIX_FMT_RGB32; if ((ret = av_frame_get_buffer(frame, 32)) < 0) return ret; |