RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '34c22a9ca656603428b2c3490d1339c5a5966961' 

* commit '34c22a9ca656603428b2c3490d1339c5a5966961':
  faan(i)dct: Kill some disabled code

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-19 16:00:21 +01:00
parent 83706367e2 34c22a9ca6
commit 7a6514861e
2 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/faandct.c
View File

@ -96,17 +96,9 @@ static av_always_inline void row_fdct(FLOAT temp[64], int16_t *data)
tmp5 += tmp6;
tmp6 += tmp7;
#if 0
{
FLOAT z5;
z5 = (tmp4 - tmp6) * A5;
z2 = tmp4 * A2 + z5;
z4 = tmp6 * A4 + z5;
}
#else
z2= tmp4*(A2+A5) - tmp6*A5;
z4= tmp6*(A4-A5) + tmp4*A5;
#endif
tmp5*=A1;
z11= tmp7 + tmp5;
@ -158,17 +150,9 @@ void ff_faandct(int16_t *data)
tmp5 += tmp6;
tmp6 += tmp7;
#if 0
{
FLOAT z5;
z5 = (tmp4 - tmp6) * A5;
z2 = tmp4 * A2 + z5;
z4 = tmp6 * A4 + z5;
}
#else
z2= tmp4*(A2+A5) - tmp6*A5;
z4= tmp6*(A4-A5) + tmp4*A5;
#endif
tmp5*=A1;
z11= tmp7 + tmp5;

9
libavcodec/faanidct.c
View File

@ -62,17 +62,8 @@ static inline void p8idct(int16_t data[64], FLOAT temp[64], uint8_t *dest, int s
od07= s17 + s53;
od25= (s17 - s53)*(2*A4);
#if 0 //these 2 are equivalent
{
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);
#endif
od16 -= od07;
od25 -= od16;