diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 02:06:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 02:08:11 +0100 |
| commit | 5c634cbeb7b463e00ae2f2fa225a15b5b94c27be (patch) | |
| tree | 73e82b92d9c89db46e07e619fa619c0de1c1f912 /libavcodec/vp3.c | |
| parent | 2163a40a4693f309dfff14ae64aaa80f841d8a22 (diff) | |
| parent | f2408ec9d752aa6ceb7eb9edb2771eafba437c1b (diff) | |
| download | ffmpeg-5c634cbeb7b463e00ae2f2fa225a15b5b94c27be.tar.gz | |
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/vp3.c')
| -rw-r--r-- | libavcodec/vp3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 626642f4ad..4988fbd33c 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -1705,10 +1705,10 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) ff_vp3dsp_init(&s->vp3dsp, avctx->flags); for (i = 0; i < 64; i++) { -#define T(x) (x >> 3) | ((x & 7) << 3) - s->idct_permutation[i] = T(i); - s->idct_scantable[i] = T(ff_zigzag_direct[i]); -#undef T +#define TRANSPOSE(x) (x >> 3) | ((x & 7) << 3) + s->idct_permutation[i] = TRANSPOSE(i); + s->idct_scantable[i] = TRANSPOSE(ff_zigzag_direct[i]); +#undef TRANSPOSE } /* initialize to an impossible value which will force a recalculation |