Merge commit 'd34a133b78afe2793cd8537f3c7f42437f441e94'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 03:54:19 +0000 (00:54 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 03:54:19 +0000 (00:54 -0300)
* commit 'd34a133b78afe2793cd8537f3c7f42437f441e94':
  dfa: Disallow odd width/height and add proper bounds check for DDS1 chunks

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

Simple merge