diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-07 10:59:45 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-07 11:37:25 -0800 |
| commit | 84a020efc3999adec0c7aaca6039b2dd3a78579f (patch) | |
| tree | d68471891124fe2de48d73b87d1437ec4af50b57 /libavcodec/roqvideodec.c | |
| parent | cdf15771621bce7959b3e53b21426c5ba747e17b (diff) | |
| download | ffmpeg-84a020efc3999adec0c7aaca6039b2dd3a78579f.tar.gz | |
roqvideo: cosmetics.
Diffstat (limited to 'libavcodec/roqvideodec.c')
| -rw-r--r-- | libavcodec/roqvideodec.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index 0bf00cf380..4b6375ca8c 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; } } |