Merge commit 'ce6d72d10776b03c6780d4aa676414ce002285d4'
authorJames Almer <jamrial@gmail.com>
Wed, 27 Sep 2017 23:35:04 +0000 (20:35 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 27 Sep 2017 23:35:04 +0000 (20:35 -0300)
commit1a115a31d430b71973b1e1556fcf767417449f09
tree9698e9d15033b217dd20f38b6ce2e13d6e935519
parent9cf1376aadcdd8952c4ba7af0bf8634ddf99da0d
parentce6d72d10776b03c6780d4aa676414ce002285d4
Merge commit 'ce6d72d10776b03c6780d4aa676414ce002285d4'

* commit 'ce6d72d10776b03c6780d4aa676414ce002285d4':
  imgutils: Document av_image_get_buffer_size()

Merged-by: James Almer <jamrial@gmail.com>
libavutil/imgutils.h