videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Avoid branches in the loop and solve a gcc warning 

Originally committed as revision 7566 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Barbato 2007-01-17 11:02:07 +00:00
parent b90ba24b9a
commit 79acfb0e13
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavcodec/imgconvert.c
View File

@ -2256,7 +2256,7 @@ int img_pad(AVPicture *dst, const AVPicture *src, int height, int width,
int pix_fmt, int padtop, int padbottom, int padleft, int padright, int pix_fmt, int padtop, int padbottom, int padleft, int padright,
int *color) int *color)
{ {
uint8_t *optr, *iptr; uint8_t *optr;
int y_shift; int y_shift;
int x_shift; int x_shift;
int yheight; int yheight;
@ -2274,24 +2274,30 @@ int img_pad(AVPicture *dst, const AVPicture *src, int height, int width,
dst->linesize[i] * (padtop >> y_shift) + (padleft >> x_shift)); dst->linesize[i] * (padtop >> y_shift) + (padleft >> x_shift));
} }
if (padleft || padright || src) { if (padleft || padright) {
if (src) { /* first line */
iptr = src->data[i];
optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
(padleft >> x_shift);
memcpy(optr, 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));
yheight = (height - 1 - (padtop + padbottom)) >> y_shift; yheight = (height - 1 - (padtop + padbottom)) >> y_shift;
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);
if (src) { optr += dst->linesize[i];
memcpy(optr + ((padleft + padright) >> x_shift), iptr, }
src->linesize[i]); }
iptr += src->linesize[i];
} if (src) { /* first line */
uint8_t *iptr = src->data[i];
optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
(padleft >> x_shift);
memcpy(optr, iptr, src->linesize[i]);
iptr += src->linesize[i];
optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
(dst->linesize[i] - (padright >> x_shift));
yheight = (height - 1 - (padtop + padbottom)) >> y_shift;
for (y = 0; y < yheight; y++) {
memset(optr, color[i], (padleft + padright) >> x_shift);
memcpy(optr + ((padleft + padright) >> x_shift), iptr,
src->linesize[i]);
iptr += src->linesize[i];
optr += dst->linesize[i]; optr += dst->linesize[i];
} }
} }