Merge commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 19:09:49 +0000 (20:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 19:13:07 +0000 (20:13 +0100)
* commit 'e71149a7a5b10ed7baa5a06f47d0313c7bd8df52':
  nuv: validate image size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/nuv.c

Simple merge