ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Sat Aug 15 17:28:16 2015 +0200| [bd5d11d9f5fdfb5d639a182a97b84ae08af16fc0] | committer: Michael Niedermayer
ffmpeg: Use actual frame dimensions in checks in sub2video_update() Fixes Ticket4744 part2 Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd5d11d9f5fdfb5d639a182a97b84ae08af16fc0 --- ffmpeg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 9143e7b..fd59c3c 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -227,7 +227,6 @@ static void sub2video_push_ref(InputStream *ist, int64_t pts) static void sub2video_update(InputStream *ist, AVSubtitle *sub) { - int w = ist->sub2video.w, h = ist->sub2video.h; AVFrame *frame = ist->sub2video.frame; int8_t *dst; int dst_linesize; @@ -255,7 +254,7 @@ static void sub2video_update(InputStream *ist, AVSubtitle *sub) dst = frame->data [0]; dst_linesize = frame->linesize[0]; for (i = 0; i < num_rects; i++) - sub2video_copy_rect(dst, dst_linesize, w, h, sub->rects[i]); + sub2video_copy_rect(dst, dst_linesize, frame->width, frame->height, sub->rects[i]); sub2video_push_ref(ist, pts); ist->sub2video.end_pts = end_pts; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
