]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f073b2d 3ccec33)
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)
* commit '3ccec334b8502701e72ef13bed25913c3578022e':
  sbrdsp: Move a misplaced #endif directive to the right spot

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/sbrdsp.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/sbrdsp.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.