On Wed, May 15, 2013 at 12:03:08PM +0300, Martin Storsjö wrote: > From: Michael Niedermayer <[email protected]> > > --- > libavcodec/vc1.c | 38 +++++++++++++++++++------------------- > 1 file changed, 19 insertions(+), 19 deletions(-) > > diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c > index 86651fe..f94d52a 100644 > --- a/libavcodec/vc1.c > +++ b/libavcodec/vc1.c > @@ -570,6 +570,25 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, > VC1Context *v, GetBitContex > return 0; > } > > +/* fill lookup tables for intensity compensation */ > +#define INIT_LUT(lumscale, lumshift, luty, lutuv) \ > + if (!lumscale) { \ > + scale = -64; \ > + shift = (255 - lumshift * 2) << 6; \ > + if (lumshift > 31) \ > + shift += 128 << 6; \ > + } else { \ > + scale = lumscale + 32; \ > + if (lumshift > 31) \ > + shift = (lumshift - 64) << 6; \ > + else \ > + shift = lumshift << 6; \ > + } \ > + 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); \ > + } > + > int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb) > { > int pqindex, lowquant, status; > @@ -800,25 +819,6 @@ int ff_vc1_parse_frame_header(VC1Context *v, > GetBitContext* gb) > return 0; > } > > -/* fill lookup tables for intensity compensation */ > -#define INIT_LUT(lumscale, lumshift, luty, lutuv) \ > - if (!lumscale) { \ > - scale = -64; \ > - shift = (255 - lumshift * 2) << 6; \ > - if (lumshift > 31) \ > - shift += 128 << 6; \ > - } else { \ > - scale = lumscale + 32; \ > - if (lumshift > 31) \ > - shift = (lumshift - 64) << 6; \ > - else \ > - shift = lumshift << 6; \ > - } \ > - 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); \ > - } > - > int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) > { > int pqindex, lowquant; > --
looks OK _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
