Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'

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

Conflicts:
	libavcodec/flvdec.c

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

diff --cc libavcodec/flvdec.c
index ade2f79b6d5c1ecc084c54ed47543377bd0246f9,3405058bca87474c8094d5acad14c216838e65ef..3b048f666df2450786140914b4c98be30cb5c804
--- 1/libavcodec/flvdec.c
--- 2/libavcodec/flvdec.c
+++ b/libavcodec/flvdec.c
@@@ -45,14 -46,14 +46,14 @@@ int ff_flv_decode_picture_header(MpegEn
      format = get_bits(&s->gb, 5);
      if (format != 0 && format != 1) {
          av_log(s->avctx, AV_LOG_ERROR, "Bad picture format\n");
 -        return -1;
 +        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);
+     format            = get_bits(&s->gb, 3);
      switch (format) {
      case 0:
-         width = get_bits(&s->gb, 8);
+         width  = get_bits(&s->gb, 8);
          height = get_bits(&s->gb, 8);
          break;
      case 1:
@@@ -83,9 -84,9 +84,9 @@@
          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 -1;
 +        return AVERROR(EINVAL);
-     s->width = width;
+     s->width  = width;
      s->height = height;
  
      s->pict_type = AV_PICTURE_TYPE_I + get_bits(&s->gb, 2);
@@@ -102,14 -103,11 +103,15 @@@
      s->h263_long_vectors = 0;
  
      /* PEI */
 -    while (get_bits1(&s->gb) != 0)
 -        skip_bits(&s->gb, 8);
 +    if (skip_1stop_8data_bits(&s->gb) < 0)
 +        return AVERROR_INVALIDDATA;
++
      s->f_code = 1;
  
-     if(s->avctx->debug & FF_DEBUG_PICT_INFO){
 +    if (s->ehc_mode)
 +        s->avctx->sample_aspect_ratio= (AVRational){1,2};
 +
+     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);