[FFmpeg-cvslog] Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 17 19:06:14 2016 +0100| [dff9894acdf83121b32aa8233d03c9e5dcd547c0] | committer: Derek Buitenhuis

Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'

* commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc':
  nuv: Use the correct context for av_image_check_size

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dff9894acdf83121b32aa8233d03c9e5dcd547c0
---

 libavformat/nuv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index cd8268d..d920250 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -195,7 +195,7 @@ static int nuv_header(AVFormatContext *s)
             return AVERROR(ENOMEM);
         ctx->v_id = vst->index;
 
-        ret = av_image_check_size(width, height, 0, ctx);
+        ret = av_image_check_size(width, height, 0, s);
         if (ret < 0)
             return ret;
 


======================================================================