diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-05 19:24:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-05 19:24:49 +0200 |
| commit | 1e4e760f767b597f88442b75e90d726ae626b230 (patch) | |
| tree | bbf016203da738a1f429becdc9e8568dd1b39aa1 /libavcodec/faanidct.c | |
| parent | 73aeb27cfe4ec51c2577097c980fe126dcd1908b (diff) | |
| parent | 213e606752d16f51337e94431962fb5d7749c07e (diff) | |
| download | ffmpeg-1e4e760f767b597f88442b75e90d726ae626b230.tar.gz | |
Merge commit '213e606752d16f51337e94431962fb5d7749c07e'
* commit '213e606752d16f51337e94431962fb5d7749c07e':
Replace av_unused attributes by block structures
Conflicts:
libavcodec/h264_loopfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/faanidct.c')
| -rw-r--r-- | libavcodec/faanidct.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/faanidct.c b/libavcodec/faanidct.c index 5f34fa508f..ca82f778ba 100644 --- a/libavcodec/faanidct.c +++ b/libavcodec/faanidct.c @@ -49,7 +49,6 @@ B7*B0/8, B7*B1/8, B7*B2/8, B7*B3/8, B7*B4/8, B7*B5/8, B7*B6/8, B7*B7/8, static inline void p8idct(int16_t data[64], FLOAT temp[64], uint8_t *dest, int stride, int x, int y, int type){ int i; - FLOAT av_unused tmp0; FLOAT s04, d04, s17, d17, s26, d26, s53, d53; FLOAT os07, os16, os25, os34; FLOAT od07, od16, od25, od34; @@ -64,9 +63,12 @@ static inline void p8idct(int16_t data[64], FLOAT temp[64], uint8_t *dest, int s od25= (s17 - s53)*(2*A4); #if 0 //these 2 are equivalent - tmp0= (d17 + d53)*(2*A2); - od34= d17*( 2*B6) - tmp0; - od16= d53*(-2*B2) + tmp0; + { + FLOAT tmp0; + tmp0 = (d17 + d53) * (2 * A2); + od34 = d17 * (2 * B6) - tmp0; + od16 = d53 * (-2 * B2) + tmp0; + } #else od34= d17*(2*(B6-A2)) - d53*(2*A2); od16= d53*(2*(A2-B2)) + d17*(2*A2); |