Merge commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef'

* commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef':
  flv: K&R formatting cosmetics

Conflicts:
	libavcodec/flv.h
	libavcodec/flvdec.c
	libavcodec/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 42 insertions, 36 deletions

diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c
index 4c045f8be6..070b528df3 100644
--- a/libavcodec/flvenc.c
+++ b/libavcodec/flvenc.c
@@ -1,5 +1,6 @@
 /*
  * FLV Encoding specific code.
+ *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
@@ -17,58 +18,62 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "mpegvideo.h"
-#include "h263.h"
 #include "flv.h"
+#include "h263.h"
+#include "mpegvideo.h"
 
-void ff_flv_encode_picture_header(MpegEncContext * s, int picture_number)
+void ff_flv_encode_picture_header(MpegEncContext *s, int picture_number)
 {
-      int format;
+    int format;
 
-      avpriv_align_put_bits(&s->pb);
+    avpriv_align_put_bits(&s->pb);
 
-      put_bits(&s->pb, 17, 1);
-      put_bits(&s->pb, 5, (s->h263_flv-1)); /* 0: h263 escape codes 1: 11-bit escape codes */
-      put_bits(&s->pb, 8, (((int64_t)s->picture_number * 30 * s->avctx->time_base.num) / //FIXME use timestamp
-                           s->avctx->time_base.den) & 0xff); /* TemporalReference */
-      if (s->width == 352 && s->height == 288)
+    put_bits(&s->pb, 17, 1);
+    /* 0: h263 escape codes 1: 11-bit escape codes */
+    put_bits(&s->pb, 5, (s->h263_flv - 1));
+    put_bits(&s->pb, 8,
+             (((int64_t) s->picture_number * 30 * s->avctx->time_base.num) /   // FIXME use timestamp
+              s->avctx->time_base.den) & 0xff);   /* TemporalReference */
+    if (s->width == 352 && s->height == 288)
         format = 2;
-      else if (s->width == 176 && s->height == 144)
+    else if (s->width == 176 && s->height == 144)
         format = 3;
-      else if (s->width == 128 && s->height == 96)
+    else if (s->width == 128 && s->height == 96)
         format = 4;
-      else if (s->width == 320 && s->height == 240)
+    else if (s->width == 320 && s->height == 240)
         format = 5;
-      else if (s->width == 160 && s->height == 120)
+    else if (s->width == 160 && s->height == 120)
         format = 6;
-      else if (s->width <= 255 && s->height <= 255)
-        format = 0; /* use 1 byte width & height */
-      else
-        format = 1; /* use 2 bytes width & height */
-      put_bits(&s->pb, 3, format); /* PictureSize */
-      if (format == 0) {
+    else if (s->width <= 255 && s->height <= 255)
+        format = 0;   /* use 1 byte width & height */
+    else
+        format = 1;   /* use 2 bytes width & height */
+    put_bits(&s->pb, 3, format);   /* PictureSize */
+    if (format == 0) {
         put_bits(&s->pb, 8, s->width);
         put_bits(&s->pb, 8, s->height);
-      } else if (format == 1) {
+    } else if (format == 1) {
         put_bits(&s->pb, 16, s->width);
         put_bits(&s->pb, 16, s->height);
-      }
-      put_bits(&s->pb, 2, s->pict_type == AV_PICTURE_TYPE_P); /* PictureType */
-      put_bits(&s->pb, 1, 1); /* DeblockingFlag: on */
-      put_bits(&s->pb, 5, s->qscale); /* Quantizer */
-      put_bits(&s->pb, 1, 0); /* ExtraInformation */
+    }
+    put_bits(&s->pb, 2, s->pict_type == AV_PICTURE_TYPE_P);   /* PictureType */
+    put_bits(&s->pb, 1, 1);   /* DeblockingFlag: on */
+    put_bits(&s->pb, 5, s->qscale);   /* Quantizer */
+    put_bits(&s->pb, 1, 0);   /* ExtraInformation */
 
-      if(s->h263_aic){
-        s->y_dc_scale_table=
-          s->c_dc_scale_table= ff_aic_dc_scale_table;
-      }else{
-        s->y_dc_scale_table=
-          s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
-      }
+    if (s->h263_aic) {
+        s->y_dc_scale_table =
+        s->c_dc_scale_table = ff_aic_dc_scale_table;
+    } else {
+        s->y_dc_scale_table =
+        s->c_dc_scale_table = ff_mpeg1_dc_scale_table;
+    }
 }
 
-void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run, int last){
-    if(level < 64) { // 7-bit level
+void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level,
+                           int run, int last)
+{
+    if (level < 64) { // 7-bit level
         put_bits(pb, 1, 0);
         put_bits(pb, 1, last);
         put_bits(pb, 6, run);
@@ -95,6 +100,7 @@ AVCodec ff_flv_encoder = {
     .init           = ff_mpv_encode_init,
     .encode2        = ff_mpv_encode_picture,
     .close          = ff_mpv_encode_end,
-    .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
+    .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
+                                                     AV_PIX_FMT_NONE},
     .priv_class     = &flv_class,
 };