summaryrefslogtreecommitdiff
path: root/libavcodec/roqvideodec.c
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2007-06-02 01:42:47 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2007-06-02 01:42:47 +0000
commite5e587afbe165a30d809b45e533c27198670bdb3 (patch)
tree929e59de3975862650bba48585ed13aa2a545048 /libavcodec/roqvideodec.c
parent2c124cb65c24cc7d0538260726045d68442eef25 (diff)
Remove get_byte wrapper
Originally committed as revision 9170 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/roqvideodec.c')
-rw-r--r--libavcodec/roqvideodec.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
index 6f1cb30368..f0601ef52b 100644
--- a/libavcodec/roqvideodec.c
+++ b/libavcodec/roqvideodec.c
@@ -39,8 +39,6 @@
#define avg2(a,b) av_clip_uint8(((int)(a)+(int)(b)+1)>>1)
#define avg4(a,b,c,d) av_clip_uint8(((int)(a)+(int)(b)+(int)(c)+(int)(d)+2)>>2)
-#define get_byte(in_buffer) *(in_buffer++)
-
static void roqvideo_decode_frame(RoqContext *ri)
{
unsigned int chunk_id = 0, chunk_arg = 0;
@@ -65,16 +63,16 @@ static void roqvideo_decode_frame(RoqContext *ri)
if((nv2 = chunk_arg & 0xff) == 0 && nv1 * 6 < chunk_size)
nv2 = 256;
for(i = 0; i < nv1; i++) {
- ri->cells[i].y[0] = get_byte(buf);
- ri->cells[i].y[1] = get_byte(buf);
- ri->cells[i].y[2] = get_byte(buf);
- ri->cells[i].y[3] = get_byte(buf);
- ri->cells[i].u = get_byte(buf);
- ri->cells[i].v = get_byte(buf);
+ ri->cells[i].y[0] = *buf++;
+ ri->cells[i].y[1] = *buf++;
+ ri->cells[i].y[2] = *buf++;
+ ri->cells[i].y[3] = *buf++;
+ ri->cells[i].u = *buf++;
+ ri->cells[i].v = *buf++;
}
for(i = 0; i < nv2; i++)
for(j = 0; j < 4; j++)
- ri->qcells[i].idx[j] = get_byte(buf);
+ ri->qcells[i].idx[j] = *buf++;
}
}