virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

ffmpeg: Use actual frame dimensions in checks in sub2video_update()

Browse Source 
Fixes Ticket4744 part2

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-08-15 17:28:16 +02:00
parent 0ac83047f6
commit bd5d11d9f5
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ffmpeg.c
View File

@ -227,7 +227,6 @@ static void sub2video_push_ref(InputStream *ist, int64_t pts)
static void sub2video_update(InputStream *ist, AVSubtitle *sub) static void sub2video_update(InputStream *ist, AVSubtitle *sub)
{ {
int w = ist->sub2video.w, h = ist->sub2video.h;
AVFrame *frame = ist->sub2video.frame; AVFrame *frame = ist->sub2video.frame;
int8_t *dst; int8_t *dst;
int dst_linesize; int dst_linesize;
@ -255,7 +254,7 @@ static void sub2video_update(InputStream *ist, AVSubtitle *sub)
dst = frame->data [0]; dst = frame->data [0];
dst_linesize = frame->linesize[0]; dst_linesize = frame->linesize[0];
for (i = 0; i < num_rects; i++) 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); sub2video_push_ref(ist, pts);
ist->sub2video.end_pts = end_pts; ist->sub2video.end_pts = end_pts;
} }