[FFmpeg-cvslog] r20562 - trunk/libavcodec/imgconvert.c
ramiro
subversion
Fri Nov 20 12:38:37 CET 2009
Author: ramiro
Date: Fri Nov 20 12:38:37 2009
New Revision: 20562
Log:
Indent
Modified:
trunk/libavcodec/imgconvert.c
Modified: trunk/libavcodec/imgconvert.c
==============================================================================
--- trunk/libavcodec/imgconvert.c Fri Nov 20 11:23:40 2009 (r20561)
+++ trunk/libavcodec/imgconvert.c Fri Nov 20 12:38:37 2009 (r20562)
@@ -883,11 +883,11 @@ int avpicture_layout(const AVPicture* sr
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* sr
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)
More information about the ffmpeg-cvslog
mailing list