diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-24 15:33:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-24 15:33:11 +0200 |
| commit | c560437e957cfcd7700fc935b840ced0afd903ab (patch) | |
| tree | c0cf46c723a961d31838b7fc54c60d7591d8afef /libavcodec/vc1.c | |
| parent | c5669f3c5996836f13b47ede4cf430035041cd7c (diff) | |
| download | ffmpeg-c560437e957cfcd7700fc935b840ced0afd903ab.tar.gz | |
vc1: make INIT_LUT() self contained
factorize variable declarations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.c')
| -rw-r--r-- | libavcodec/vc1.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index 21ec294595..07f5fb5a60 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -577,7 +577,8 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex } /* fill lookup tables for intensity compensation */ -#define INIT_LUT(lumscale, lumshift, luty, lutuv) \ +#define INIT_LUT(lumscale, lumshift, luty, lutuv) do {\ + int scale, shift, i; \ if (!lumscale) { \ scale = -64; \ shift = (255 - lumshift * 2) << 6; \ @@ -593,7 +594,8 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex for (i = 0; i < 256; i++) { \ luty[i] = av_clip_uint8((scale * i + shift + 32) >> 6); \ lutuv[i] = av_clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6); \ - } + } \ + }while(0) int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) { @@ -695,7 +697,6 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) lowquant = (v->pq > 12) ? 0 : 1; v->mv_mode = ff_vc1_mv_pmode_table[lowquant][get_unary(gb, 1, 4)]; if (v->mv_mode == MV_PMODE_INTENSITY_COMP) { - int scale, shift, i; v->mv_mode2 = ff_vc1_mv_pmode_table2[lowquant][get_unary(gb, 1, 3)]; v->lumscale = get_bits(gb, 6); v->lumshift = get_bits(gb, 6); @@ -817,7 +818,6 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) int pqindex, lowquant; int status; int mbmodetab, imvtab, icbptab, twomvbptab, fourmvbptab; /* useful only for debugging */ - int scale, shift, i; /* for initializing LUT for intensity compensation */ int field_mode, fcm; v->numref=0; |