Merge commit 'c6b42e85'

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

Conflicts:
	libavcodec/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/flvdec.c

@@ -22,11 +22,12 @@
 #include "flv.h"
 #include "libavutil/imgutils.h"
 
-void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last){
+void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last)
+{
     int is11 = get_bits1(gb);
     *last = get_bits1(gb);
     *run  = get_bits(gb, 6);
-    if(is11){
+    if (is11) {
         *level = get_sbits(gb, 11);
     } else {
         *level = get_sbits(gb, 7);
@@ -47,7 +48,7 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
         av_log(s->avctx, AV_LOG_ERROR, "Bad picture format\n");
         return AVERROR_INVALIDDATA;
     }
-    s->h263_flv = format+1;
+    s->h263_flv       = format + 1;
     s->picture_number = get_bits(&s->gb, 8); /* picture timestamp */
     format            = get_bits(&s->gb, 3);
     switch (format) {
@@ -83,7 +84,7 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
         width = height = 0;
         break;
     }
-    if(av_image_check_size(width, height, 0, s->avctx))
+    if (av_image_check_size(width, height, 0, s->avctx))
         return AVERROR(EINVAL);
     s->width  = width;
     s->height = height;
@@ -94,7 +95,7 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
         s->pict_type = AV_PICTURE_TYPE_P;
 
     skip_bits1(&s->gb); /* deblocking flag */
-    s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);
+    s->chroma_qscale = s->qscale = get_bits(&s->gb, 5);
 
     s->h263_plus = 0;
 
@@ -104,19 +105,19 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
     /* PEI */
     if (skip_1stop_8data_bits(&s->gb) < 0)
         return AVERROR_INVALIDDATA;
+
     s->f_code = 1;
 
     if (s->ehc_mode)
         s->avctx->sample_aspect_ratio= (AVRational){1,2};
 
-    if(s->avctx->debug & FF_DEBUG_PICT_INFO){
+    if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
         av_log(s->avctx, AV_LOG_DEBUG, "%c esc_type:%d, qp:%d num:%d\n",
                s->droppable ? 'D' : av_get_picture_type_char(s->pict_type),
                s->h263_flv - 1, s->qscale, s->picture_number);
     }
 
-    s->y_dc_scale_table=
-    s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
+    s->y_dc_scale_table = s->c_dc_scale_table = ff_mpeg1_dc_scale_table;
 
     return 0;
 }