diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-15 21:37:40 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-15 21:37:40 -0300 |
| commit | e298497f0c6ed7c87371ca78a3788d2d0026cd0c (patch) | |
| tree | feec7af17e1a861b058d339bbf2713d57fbe311e | |
| parent | f073b2da8410eb83eb0c7db6badc5f0bdeeb1f9c (diff) | |
| parent | 3ccec334b8502701e72ef13bed25913c3578022e (diff) | |
| download | ffmpeg-e298497f0c6ed7c87371ca78a3788d2d0026cd0c.tar.gz | |
Merge commit '3ccec334b8502701e72ef13bed25913c3578022e'
* commit '3ccec334b8502701e72ef13bed25913c3578022e':
sbrdsp: Move a misplaced #endif directive to the right spot
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/sbrdsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/sbrdsp.c b/libavcodec/sbrdsp.c index cc432b6534..a93b5f9c13 100644 --- a/libavcodec/sbrdsp.c +++ b/libavcodec/sbrdsp.c @@ -153,8 +153,8 @@ static void sbr_autocorrelate_c(const float x[40][2], float phi[3][2][2]) phi[2 - 1][1][1] = imag_sum1 + x[ 0][0] * x[ 1][1] - x[ 0][1] * x[ 1][0]; phi[0 ][0][0] = real_sum1 + x[38][0] * x[39][0] + x[38][1] * x[39][1]; phi[0 ][0][1] = imag_sum1 + x[38][0] * x[39][1] - x[38][1] * x[39][0]; -#endif } +#endif static void sbr_hf_gen_c(float (*X_high)[2], const float (*X_low)[2], const float alpha0[2], const float alpha1[2], |