OSDN Git Service

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)
commitdff9894acdf83121b32aa8233d03c9e5dcd547c0
tree103e60a0417e62f733898c8014c55bf934aa90b1
parentd9357332ae9a531075a50bc6ad24a166fe5a53ad
parent709c0f79d8032fcf733bfe58e79ca7ff0858c8bc
Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'

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

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