tiff: K&R formatting cosmetics

libavcodec/tiff.c

@@ -25,19 +25,20 @@
  * @author Konstantin Shishkov
  */
 
-#include "avcodec.h"
 #include "config.h"
 #if CONFIG_ZLIB
 #include <zlib.h>
 #endif
-#include "lzw.h"
-#include "tiff.h"
-#include "faxcompr.h"
-#include "internal.h"
-#include "mathops.h"
+
 #include "libavutil/attributes.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/imgutils.h"
+#include "avcodec.h"
+#include "faxcompr.h"
+#include "internal.h"
+#include "lzw.h"
+#include "mathops.h"
+#include "tiff.h"
 
 typedef struct TiffContext {
     AVCodecContext *avctx;
@@ -78,10 +79,14 @@ static unsigned tget_long(const uint8_t **p, int le)
 static unsigned tget(const uint8_t **p, int type, int le)
 {
     switch (type) {
-    case TIFF_BYTE : return *(*p)++;
-    case TIFF_SHORT: return tget_short(p, le);
-    case TIFF_LONG : return tget_long(p, le);
-    default        : return UINT_MAX;
+    case TIFF_BYTE:
+        return *(*p)++;
+    case TIFF_SHORT:
+        return tget_short(p, le);
+    case TIFF_LONG:
+        return tget_long(p, le);
+    default:
+        return UINT_MAX;
     }
 }
 
@@ -151,8 +156,9 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
             return ret;
         }
     }
-    if (s->compr == TIFF_CCITT_RLE || s->compr == TIFF_G3
-        || s->compr == TIFF_G4) {
+    if (s->compr == TIFF_CCITT_RLE ||
+        s->compr == TIFF_G3        ||
+        s->compr == TIFF_G4) {
         int i, ret = 0;
         uint8_t *src2 = av_malloc((unsigned)size +
                                   FF_INPUT_BUFFER_PADDING_SIZE);
@@ -206,7 +212,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
             break;
         case TIFF_PACKBITS:
             for (pixels = 0; pixels < width;) {
-                code = (int8_t) * src++;
+                code = (int8_t) *src++;
                 if (code >= 0) {
                     code++;
                     if (pixels + code > width) {
@@ -339,12 +345,11 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start,
             buf   = start + off;
         }
     } else {
-        if (count <= 4 && type_sizes[type] * count <= 4) {
+        if (count <= 4 && type_sizes[type] * count <= 4)
             buf -= 4;
-        } else {
+        else
             buf = start + off;
     }
-    }
 
     if (buf && (buf < start || buf > end_buf)) {
         av_log(s->avctx, AV_LOG_ERROR,
@@ -546,12 +551,11 @@ static int decode_frame(AVCodecContext *avctx,
     const uint8_t *orig_buf = buf, *end_buf = buf + buf_size;
     unsigned off;
     int id, le, ret;
-    int i, j, entries;
-    int stride;
+    int i, j, entries, stride;
     unsigned soff, ssize;
     uint8_t *dst;
 
-    //parse image header
+    // parse image header
     if (end_buf - buf < 8)
         return AVERROR_INVALIDDATA;
     id   = AV_RL16(buf);
@@ -678,6 +682,7 @@ static av_cold int tiff_end(AVCodecContext *avctx)
 
 AVCodec ff_tiff_decoder = {
     .name           = "tiff",
+    .long_name      = NULL_IF_CONFIG_SMALL("TIFF image"),
     .type           = AVMEDIA_TYPE_VIDEO,
     .id             = AV_CODEC_ID_TIFF,
     .priv_data_size = sizeof(TiffContext),
@@ -685,5 +690,4 @@ AVCodec ff_tiff_decoder = {
     .close          = tiff_end,
     .decode         = decode_frame,
     .capabilities   = CODEC_CAP_DR1,
-    .long_name      = NULL_IF_CONFIG_SMALL("TIFF image"),
 };

libavcodec/tiff.h

@@ -31,7 +31,7 @@
 #include <stdint.h>
 
 /** abridged list of TIFF tags */
-enum TiffTags{
+enum TiffTags {
     TIFF_SUBFILE            = 0xfe,
     TIFF_WIDTH              = 0x100,
     TIFF_HEIGHT,
@@ -61,7 +61,7 @@ enum TiffTags{
 };
 
 /** list of TIFF compression types */
-enum TiffCompr{
+enum TiffCompr {
     TIFF_RAW = 1,
     TIFF_CCITT_RLE,
     TIFF_G3,
@@ -74,7 +74,7 @@ enum TiffCompr{
     TIFF_DEFLATE  = 0x80B2
 };
 
-enum TiffTypes{
+enum TiffTypes {
     TIFF_BYTE = 1,
     TIFF_STRING,
     TIFF_SHORT,