Merge commit 'f0a106578d759de6183eea3c75f8373b6d3153c1'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 18:11:21 +0000 (20:11 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 18:11:21 +0000 (20:11 +0200)
commit42b87ed01eb32b3b449e35b2926492c48220e321
tree5f7e93439793e324e113444c6fe06d0a5fcfaaf2
parent9a6f1eea3e1d6412d2bf1d4bca7dc01122208f42
parentf0a106578d759de6183eea3c75f8373b6d3153c1
Merge commit 'f0a106578d759de6183eea3c75f8373b6d3153c1'

* commit 'f0a106578d759de6183eea3c75f8373b6d3153c1':
  roqvideodec: Replace avpicture functions with imgutils

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/roqvideodec.c