diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2009-11-20 11:38:37 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2009-11-20 11:38:37 +0000 |
| commit | b16569d256e39106fa6f2d277ed04724fd52ac88 (patch) | |
| tree | 7003415da460c819aaeb091c8c34203dce2d56e8 /libavcodec/imgconvert.c | |
| parent | 0584b71823b4d7df2a0c1db54156f1f7ed0a319d (diff) | |
| download | ffmpeg-b16569d256e39106fa6f2d277ed04724fd52ac88.tar.gz | |
Indent
Originally committed as revision 20562 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/imgconvert.c')
| -rw-r--r-- | libavcodec/imgconvert.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 7e096967df..e83c5136b0 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -883,11 +883,11 @@ int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, pix_fmt == PIX_FMT_RGB555LE) w = width * 2; else if (pix_fmt == PIX_FMT_UYYVYY411) - w = width + width/2; + w = width + width/2; else if (pix_fmt == PIX_FMT_PAL8) - w = width; + w = width; else - w = width * (pf->depth * pf->nb_channels / 8); + w = width * (pf->depth * pf->nb_channels / 8); data_planes = 1; h = height; @@ -901,19 +901,19 @@ int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, oh = h; for (i=0; i<data_planes; i++) { - if (i == 1) { - w = ((width >> pf->x_chroma_shift) * pf->depth + 7) / 8; - h = height >> pf->y_chroma_shift; - } else if (i == 3) { - w = ow; - h = oh; - } - s = src->data[i]; - for(j=0; j<h; j++) { - memcpy(dest, s, w); - dest += w; - s += src->linesize[i]; - } + if (i == 1) { + w = ((width >> pf->x_chroma_shift) * pf->depth + 7) / 8; + h = height >> pf->y_chroma_shift; + } else if (i == 3) { + w = ow; + h = oh; + } + s = src->data[i]; + for(j=0; j<h; j++) { + memcpy(dest, s, w); + dest += w; + s += src->linesize[i]; + } } if (pf->pixel_type == FF_PIXEL_PALETTE) |