Merge commit 'f7168d7016f7d1034ec90223fa91a90711704e11'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 20:02:01 +0000 (20:02 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 20:02:01 +0000 (20:02 +0000)
commitfa6c7ccc20d3dc8f220af31f10a159e1b7a13b92
tree39281c471d2dd52c27a7e8fb04f446803d3e5ef2
parentfa48cd8814e790d837179f8336d129ea1c2f9f8c
parentf7168d7016f7d1034ec90223fa91a90711704e11
Merge commit 'f7168d7016f7d1034ec90223fa91a90711704e11'

* commit 'f7168d7016f7d1034ec90223fa91a90711704e11':
  imgconvert: Move AVPicture-related static function to the deprecated section

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