From c2c237a0d55ce1f0a57d66b9f051d1ca9556a792 Mon Sep 17 00:00:00 2001 From: Vitor Sessak Date: Sat, 24 May 2008 09:17:30 +0000 Subject: [PATCH] More simplifications of ra144_decode_frame() Originally committed as revision 13275 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/ra144.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c index a3e0cd5be9..07431bfd08 100644 --- a/libavcodec/ra144.c +++ b/libavcodec/ra144.c @@ -365,7 +365,6 @@ static int ra144_decode_frame(AVCodecContext * avctx, static const uint8_t sizes[10] = {6, 5, 5, 4, 4, 3, 3, 3, 3, 2}; unsigned int a, c; int i; - signed short *shptr; int16_t *data = vdata; unsigned int val; @@ -397,15 +396,12 @@ static int ra144_decode_frame(AVCodecContext * avctx, /* do output */ for (c=0; c<4; c++) { - unsigned int gval = glob->gbuf1[c]; - unsigned short *gsp = glob->gbuf2[c]; - signed short output_buffer[40]; + do_output_subblock(glob, glob->gbuf2[c], glob->gbuf1[c], data, &gb); - do_output_subblock(glob, gsp, gval, output_buffer, &gb); - - shptr = output_buffer; - while (shptr < output_buffer + BLOCKSIZE) - *data++ = av_clip_int16(*(shptr++) << 2); + for (i=0; ioldval = val;