From f2408ec9d752aa6ceb7eb9edb2771eafba437c1b Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 18 Feb 2014 09:57:45 -0800 Subject: Give IDCT matrix transpose macro a more descriptive name This also avoids a macro name clash and related warning on ARM. --- libavcodec/h264.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libavcodec/h264.c') diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 7f9683edac..c76abf7c45 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2904,18 +2904,18 @@ static void init_scan_tables(H264Context *h) { int i; for (i = 0; i < 16; i++) { -#define T(x) (x >> 2) | ((x << 2) & 0xF) - h->zigzag_scan[i] = T(zigzag_scan[i]); - h->field_scan[i] = T(field_scan[i]); -#undef T +#define TRANSPOSE(x) (x >> 2) | ((x << 2) & 0xF) + h->zigzag_scan[i] = TRANSPOSE(zigzag_scan[i]); + h->field_scan[i] = TRANSPOSE(field_scan[i]); +#undef TRANSPOSE } for (i = 0; i < 64; i++) { -#define T(x) (x >> 3) | ((x & 7) << 3) - h->zigzag_scan8x8[i] = T(ff_zigzag_direct[i]); - h->zigzag_scan8x8_cavlc[i] = T(zigzag_scan8x8_cavlc[i]); - h->field_scan8x8[i] = T(field_scan8x8[i]); - h->field_scan8x8_cavlc[i] = T(field_scan8x8_cavlc[i]); -#undef T +#define TRANSPOSE(x) (x >> 3) | ((x & 7) << 3) + h->zigzag_scan8x8[i] = TRANSPOSE(ff_zigzag_direct[i]); + h->zigzag_scan8x8_cavlc[i] = TRANSPOSE(zigzag_scan8x8_cavlc[i]); + h->field_scan8x8[i] = TRANSPOSE(field_scan8x8[i]); + h->field_scan8x8_cavlc[i] = TRANSPOSE(field_scan8x8_cavlc[i]); +#undef TRANSPOSE } if (h->sps.transform_bypass) { // FIXME same ugly h->zigzag_scan_q0 = zigzag_scan; -- cgit v1.2.3