diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2007-01-17 10:47:58 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2007-01-17 10:47:58 +0000 |
| commit | 6845801f821f370bf4445702407b346a1be55d3a (patch) | |
| tree | da4d2376a83d074589bb553932cb2b13e840df0b | |
| parent | 75a9fbb9e9a478577f6f73d0297ec5c75b54b016 (diff) | |
| download | ffmpeg-6845801f821f370bf4445702407b346a1be55d3a.tar.gz | |
Cosmetics
Originally committed as revision 7564 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/imgconvert.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index d5b4cdca0c..2f9d6908a1 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -2252,8 +2252,9 @@ int img_crop(AVPicture *dst, const AVPicture *src, /** * Pad image */ -int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix_fmt, - int padtop, int padbottom, int padleft, int padright, int *color) +int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, + int pix_fmt, int padtop, int padbottom, int padleft, int padright, + int *color) { uint8_t *optr, *iptr; int y_shift; @@ -2261,30 +2262,34 @@ int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix int yheight; int i, y; - if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB || !is_yuv_planar(&pix_fmt_info[pix_fmt])) - return -1; + if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB || + !is_yuv_planar(&pix_fmt_info[pix_fmt])) return -1; for (i = 0; i < 3; i++) { x_shift = i ? pix_fmt_info[pix_fmt].x_chroma_shift : 0; y_shift = i ? pix_fmt_info[pix_fmt].y_chroma_shift : 0; if (padtop || padleft) { - memset(dst->data[i], color[i], dst->linesize[i] * (padtop >> y_shift) + (padleft >> x_shift)); + memset(dst->data[i], color[i], + dst->linesize[i] * (padtop >> y_shift) + (padleft >> x_shift)); } if (padleft || padright || src) { if (src) { /* first line */ iptr = src->data[i]; - optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) + (padleft >> x_shift); + 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)); + 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); if (src) { - memcpy(optr + ((padleft + padright) >> x_shift), iptr, src->linesize[i]); + memcpy(optr + ((padleft + padright) >> x_shift), iptr, + src->linesize[i]); iptr += src->linesize[i]; } optr += dst->linesize[i]; @@ -2292,8 +2297,10 @@ int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix } if (padbottom || padright) { - optr = dst->data[i] + dst->linesize[i] * ((height - padbottom) >> y_shift) - (padright >> x_shift); - memset(optr, color[i], dst->linesize[i] * (padbottom >> y_shift) + (padright >> x_shift)); + optr = dst->data[i] + dst->linesize[i] * + ((height - padbottom) >> y_shift) - (padright >> x_shift); + memset(optr, color[i],dst->linesize[i] * + (padbottom >> y_shift) + (padright >> x_shift)); } } return 0; |