virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

memcpy considering output width, not src linesize, fix segv with av_picture_pad

Browse Source 
Originally committed as revision 13594 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-06-01 02:28:33 +00:00
parent 64e3e66175
commit 1be97a218e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/imgconvert.c
View File

@ -2063,7 +2063,7 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width,
uint8_t *iptr = src->data[i]; uint8_t *iptr = src->data[i];
optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) + optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
(padleft >> x_shift); (padleft >> x_shift);
memcpy(optr, iptr, src->linesize[i]); memcpy(optr, iptr, (width - padleft - padright) >> x_shift);
iptr += src->linesize[i]; iptr += src->linesize[i];
optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) + optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
(dst->linesize[i] - (padright >> x_shift)); (dst->linesize[i] - (padright >> x_shift));
@ -2071,7 +2071,7 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width,
for (y = 0; y < yheight; y++) { for (y = 0; y < yheight; y++) {
memset(optr, color[i], (padleft + padright) >> x_shift); memset(optr, color[i], (padleft + padright) >> x_shift);
memcpy(optr + ((padleft + padright) >> x_shift), iptr, memcpy(optr + ((padleft + padright) >> x_shift), iptr,
src->linesize[i]); (width - padleft - padright) >> x_shift);
iptr += src->linesize[i]; iptr += src->linesize[i];
optr += dst->linesize[i]; optr += dst->linesize[i];
} }