diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 05:06:34 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 05:08:11 +0400 |
commit | 5c634cbeb7b463e00ae2f2fa225a15b5b94c27be (patch) | |
tree | 73e82b92d9c89db46e07e619fa619c0de1c1f912 /libavcodec/h264.c | |
parent | 2163a40a4693f309dfff14ae64aaa80f841d8a22 (diff) | |
parent | f2408ec9d752aa6ceb7eb9edb2771eafba437c1b (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Give IDCT matrix transpose macro a more descriptive name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r-- | libavcodec/h264.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 088083462d..9379b2ff4a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2975,18 +2975,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 memcpy(h->zigzag_scan_q0 , zigzag_scan , sizeof(h->zigzag_scan_q0 )); |