[FFmpeg-cvslog] Merge commit '3ccec334b8502701e72ef13bed25913c3578022e'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Mar 15 21:37:40 2017 -0300| [e298497f0c6ed7c87371ca78a3788d2d0026cd0c] | committer: James Almer

Merge commit '3ccec334b8502701e72ef13bed25913c3578022e'

* commit '3ccec334b8502701e72ef13bed25913c3578022e':
  sbrdsp: Move a misplaced #endif directive to the right spot

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e298497f0c6ed7c87371ca78a3788d2d0026cd0c
---

 libavcodec/sbrdsp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/sbrdsp.c b/libavcodec/sbrdsp.c
index cc432b6..a93b5f9 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],


======================================================================