Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-17 21:06:14 +0300
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-17 21:06:18 +0300
commitdff9894acdf83121b32aa8233d03c9e5dcd547c0 (patch)
tree103e60a0417e62f733898c8014c55bf934aa90b1 /libavformat
parentd9357332ae9a531075a50bc6ad24a166fe5a53ad (diff)
parent709c0f79d8032fcf733bfe58e79ca7ff0858c8bc (diff)
Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'
* commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc': nuv: Use the correct context for av_image_check_size Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/nuv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index cd8268d2a5..d92025003b 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;