[FFmpeg-cvslog] r23113 - in trunk: libavcodec/iff.c libavformat/iff.c

[rbultje]

Author: rbultje
Date: Thu May 13 17:41:49 2010
New Revision: 23113

Log:
Reindent after r23112.

Patch by Sebastian Vater <cdgs basty googlemail com>.

Modified:
   trunk/libavcodec/iff.c
   trunk/libavformat/iff.c

Modified: trunk/libavcodec/iff.c
==============================================================================
--- trunk/libavcodec/iff.c	Thu May 13 17:39:40 2010	(r23112)
+++ trunk/libavcodec/iff.c	Thu May 13 17:41:49 2010	(r23113)
@@ -219,25 +219,25 @@ static int decode_frame_ilbm(AVCodecCont
     }
 
     if (avctx->codec_tag == MKTAG('I','L','B','M')) { // interleaved
-    if (avctx->pix_fmt == PIX_FMT_PAL8) {
-        for(y = 0; y < avctx->height; y++ ) {
-            uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
-            memset(row, 0, avctx->width);
-            for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
-                decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), plane);
-                buf += s->planesize;
+        if (avctx->pix_fmt == PIX_FMT_PAL8) {
+            for(y = 0; y < avctx->height; y++ ) {
+                uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ];
+                memset(row, 0, avctx->width);
+                for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
+                    decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), plane);
+                    buf += s->planesize;
+                }
             }
-        }
-    } else { // PIX_FMT_BGR32
-        for(y = 0; y < avctx->height; y++ ) {
-            uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
-            memset(row, 0, avctx->width << 2);
-            for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
-                decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane);
-                buf += s->planesize;
+        } else { // PIX_FMT_BGR32
+            for(y = 0; y < avctx->height; y++ ) {
+                uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]];
+                memset(row, 0, avctx->width << 2);
+                for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) {
+                    decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane);
+                    buf += s->planesize;
+                }
             }
         }
-    }
     } else if (avctx->pix_fmt == PIX_FMT_PAL8) { // IFF-PBM
         for(y = 0; y < avctx->height; y++ ) {
             uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]];

Modified: trunk/libavformat/iff.c
==============================================================================
--- trunk/libavformat/iff.c	Thu May 13 17:39:40 2010	(r23112)
+++ trunk/libavformat/iff.c	Thu May 13 17:41:49 2010	(r23113)
@@ -256,7 +256,7 @@ static int iff_read_header(AVFormatConte
     case AVMEDIA_TYPE_VIDEO:
         switch (compression) {
         case BITMAP_RAW:
-                st->codec->codec_id = CODEC_ID_IFF_ILBM;
+            st->codec->codec_id = CODEC_ID_IFF_ILBM;
             break;
         case BITMAP_BYTERUN1:
             st->codec->codec_id = CODEC_ID_IFF_BYTERUN1;