Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:06:14 +0000 (19:06 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:06:18 +0000 (19:06 +0100)
* commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc':
  nuv: Use the correct context for av_image_check_size

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavformat/nuv.c

Simple merge