diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 01:15:37 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 01:15:37 +0400 |
commit | 3ea5beab8f7352c94f71148ab98dd247412129a3 (patch) | |
tree | 19fe460efe5b81d158d46f9c50e0feee8992f7bd /libavcodec/flvdec.c | |
parent | 0a5cc20d4aace91fdc8c56149bfee1efb726da8c (diff) | |
parent | c6b42e85493915a3c3891345f57422f9031a0b4f (diff) |
Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'
* commit 'c6b42e85493915a3c3891345f57422f9031a0b4f':
flv: K&R formatting cosmetics
Conflicts:
libavcodec/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flvdec.c')
-rw-r--r-- | libavcodec/flvdec.c | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index ade2f79b6d..3b048f666d 100644 --- a/libavcodec/flvdec.c +++ b/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){ + *run = get_bits(gb, 6); + if (is11) { *level = get_sbits(gb, 11); } else { *level = get_sbits(gb, 7); @@ -47,45 +48,45 @@ 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); + 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: - width = get_bits(&s->gb, 16); + width = get_bits(&s->gb, 16); height = get_bits(&s->gb, 16); break; case 2: - width = 352; + width = 352; height = 288; break; case 3: - width = 176; + width = 176; height = 144; break; case 4: - width = 128; + width = 128; height = 96; break; case 5: - width = 320; + width = 320; height = 240; break; case 6: - width = 160; + width = 160; height = 120; break; default: 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->width = width; s->height = height; s->pict_type = AV_PICTURE_TYPE_I + get_bits(&s->gb, 2); @@ -94,29 +95,29 @@ 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; - s->unrestricted_mv = 1; + s->unrestricted_mv = 1; s->h263_long_vectors = 0; /* 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; } |