Merge commit '3ccec334b8502701e72ef13bed25913c3578022e'
authorJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 00:37:40 +0000 (21:37 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 00:37:40 +0000 (21:37 -0300)
commite298497f0c6ed7c87371ca78a3788d2d0026cd0c
treefeec7af17e1a861b058d339bbf2713d57fbe311e
parentf073b2da8410eb83eb0c7db6badc5f0bdeeb1f9c
parent3ccec334b8502701e72ef13bed25913c3578022e
Merge commit '3ccec334b8502701e72ef13bed25913c3578022e'

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

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/sbrdsp.c