[FFmpeg-cvslog] roqvideo: cosmetics.
Ronald S. Bultje
git at videolan.org
Thu Mar 8 03:10:43 CET 2012
ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Wed Mar 7 10:59:45 2012 -0800| [84a020efc3999adec0c7aaca6039b2dd3a78579f] | committer: Ronald S. Bultje
roqvideo: cosmetics.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=84a020efc3999adec0c7aaca6039b2dd3a78579f
---
libavcodec/roqvideodec.c | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
index 0bf00cf..4b6375c 100644
--- a/libavcodec/roqvideodec.c
+++ b/libavcodec/roqvideodec.c
@@ -44,9 +44,9 @@ static void roqvideo_decode_frame(RoqContext *ri)
int64_t chunk_start;
while (bytestream2_get_bytes_left(&ri->gb) > 0) {
- chunk_id = bytestream2_get_le16(&ri->gb);
+ chunk_id = bytestream2_get_le16(&ri->gb);
chunk_size = bytestream2_get_le32(&ri->gb);
- chunk_arg = bytestream2_get_le16(&ri->gb);
+ chunk_arg = bytestream2_get_le16(&ri->gb);
if(chunk_id == RoQ_QUAD_VQ)
break;
@@ -60,8 +60,8 @@ static void roqvideo_decode_frame(RoqContext *ri)
ri->cb2x2[i].y[1] = bytestream2_get_byte(&ri->gb);
ri->cb2x2[i].y[2] = bytestream2_get_byte(&ri->gb);
ri->cb2x2[i].y[3] = bytestream2_get_byte(&ri->gb);
- ri->cb2x2[i].u = bytestream2_get_byte(&ri->gb);
- ri->cb2x2[i].v = bytestream2_get_byte(&ri->gb);
+ ri->cb2x2[i].u = bytestream2_get_byte(&ri->gb);
+ ri->cb2x2[i].v = bytestream2_get_byte(&ri->gb);
}
for(i = 0; i < nv2; i++)
for(j = 0; j < 4; j++)
@@ -94,10 +94,10 @@ static void roqvideo_decode_frame(RoqContext *ri)
}
case RoQ_ID_SLD:
qcell = ri->cb4x4 + bytestream2_get_byte(&ri->gb);
- ff_apply_vector_4x4(ri, xp, yp, ri->cb2x2 + qcell->idx[0]);
- ff_apply_vector_4x4(ri, xp+4, yp, ri->cb2x2 + qcell->idx[1]);
- ff_apply_vector_4x4(ri, xp, yp+4, ri->cb2x2 + qcell->idx[2]);
- ff_apply_vector_4x4(ri, xp+4, yp+4, ri->cb2x2 + qcell->idx[3]);
+ ff_apply_vector_4x4(ri, xp, yp, ri->cb2x2 + qcell->idx[0]);
+ ff_apply_vector_4x4(ri, xp + 4, yp, ri->cb2x2 + qcell->idx[1]);
+ ff_apply_vector_4x4(ri, xp, yp + 4, ri->cb2x2 + qcell->idx[2]);
+ ff_apply_vector_4x4(ri, xp + 4, yp + 4, ri->cb2x2 + qcell->idx[3]);
break;
case RoQ_ID_CCC:
for (k = 0; k < 4; k++) {
@@ -124,16 +124,16 @@ static void roqvideo_decode_frame(RoqContext *ri)
}
case RoQ_ID_SLD:
qcell = ri->cb4x4 + bytestream2_get_byte(&ri->gb);
- ff_apply_vector_2x2(ri, x, y, ri->cb2x2 + qcell->idx[0]);
- ff_apply_vector_2x2(ri, x+2, y, ri->cb2x2 + qcell->idx[1]);
- ff_apply_vector_2x2(ri, x, y+2, ri->cb2x2 + qcell->idx[2]);
- ff_apply_vector_2x2(ri, x+2, y+2, ri->cb2x2 + qcell->idx[3]);
+ ff_apply_vector_2x2(ri, x, y, ri->cb2x2 + qcell->idx[0]);
+ ff_apply_vector_2x2(ri, x + 2, y, ri->cb2x2 + qcell->idx[1]);
+ ff_apply_vector_2x2(ri, x, y + 2, ri->cb2x2 + qcell->idx[2]);
+ ff_apply_vector_2x2(ri, x + 2, y + 2, ri->cb2x2 + qcell->idx[3]);
break;
case RoQ_ID_CCC:
- ff_apply_vector_2x2(ri, x, y, ri->cb2x2 + bytestream2_get_byte(&ri->gb));
- ff_apply_vector_2x2(ri, x+2, y, ri->cb2x2 + bytestream2_get_byte(&ri->gb));
- ff_apply_vector_2x2(ri, x, y+2, ri->cb2x2 + bytestream2_get_byte(&ri->gb));
- ff_apply_vector_2x2(ri, x+2, y+2, ri->cb2x2 + bytestream2_get_byte(&ri->gb));
+ ff_apply_vector_2x2(ri, x, y, ri->cb2x2 + bytestream2_get_byte(&ri->gb));
+ ff_apply_vector_2x2(ri, x + 2, y, ri->cb2x2 + bytestream2_get_byte(&ri->gb));
+ ff_apply_vector_2x2(ri, x, y + 2, ri->cb2x2 + bytestream2_get_byte(&ri->gb));
+ ff_apply_vector_2x2(ri, x + 2, y + 2, ri->cb2x2 + bytestream2_get_byte(&ri->gb));
break;
}
}
More information about the ffmpeg-cvslog
mailing list