diff options
author | Gregory Montoir <cyx@users.sourceforge.net> | 2008-07-06 10:01:54 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2008-07-06 10:01:54 +0000 |
commit | 7bd2f502faa5932223db961b92a9f74b0b96f5d3 (patch) | |
tree | d48f24678a4f1f1c10420e81244ab2b8daa56a9d | |
parent | ca3ed63e1582e60d76b17c71a856b6f1e3618068 (diff) | |
download | ffmpeg-7bd2f502faa5932223db961b92a9f74b0b96f5d3.tar.gz |
Remove context fields which can be used as simple local variables.
patch by Gregory Montoir, cyx users sourceforge net
Originally committed as revision 14086 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/tiertexseqv.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c index d91ed05894..3ff353555d 100644 --- a/libavcodec/tiertexseqv.c +++ b/libavcodec/tiertexseqv.c @@ -32,8 +32,6 @@ typedef struct SeqVideoContext { AVCodecContext *avctx; AVFrame frame; - unsigned int palette[256]; - unsigned char block[8 * 8]; } SeqVideoContext; @@ -72,22 +70,23 @@ static const unsigned char *seq_decode_op1(SeqVideoContext *seq, const unsigned const unsigned char *color_table; int b, i, len, bits; GetBitContext gb; + unsigned char block[8 * 8]; len = *src++; if (len & 0x80) { switch (len & 3) { case 1: - src = seq_unpack_rle_block(src, seq->block, sizeof(seq->block)); + src = seq_unpack_rle_block(src, block, sizeof(block)); for (b = 0; b < 8; b++) { - memcpy(dst, &seq->block[b * 8], 8); + memcpy(dst, &block[b * 8], 8); dst += seq->frame.linesize[0]; } break; case 2: - src = seq_unpack_rle_block(src, seq->block, sizeof(seq->block)); + src = seq_unpack_rle_block(src, block, sizeof(block)); for (i = 0; i < 8; i++) { for (b = 0; b < 8; b++) - dst[b * seq->frame.linesize[0]] = seq->block[i * 8 + b]; + dst[b * seq->frame.linesize[0]] = block[i * 8 + b]; ++dst; } break; @@ -139,16 +138,17 @@ static void seqvideo_decode(SeqVideoContext *seq, const unsigned char *data, int int flags, i, j, x, y, op; unsigned char c[3]; unsigned char *dst; + uint32_t *palette; flags = *data++; if (flags & 1) { + palette = (uint32_t *)seq->frame.data[1]; for (i = 0; i < 256; i++) { for (j = 0; j < 3; j++, data++) c[j] = (*data << 2) | (*data >> 4); - seq->palette[i] = AV_RB24(c); + palette[i] = AV_RB24(c); } - memcpy(seq->frame.data[1], seq->palette, sizeof(seq->palette)); seq->frame.palette_has_changed = 1; } |