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 /libavcodec/psd.c | |
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>
Diffstat (limited to 'libavcodec/psd.c')
0 files changed, 0 insertions, 0 deletions