Merge commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Jun 2015 18:53:06 +0000 (20:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Jun 2015 18:53:34 +0000 (20:53 +0200)
* commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c':
  aic: Improve error reporting

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/aic.c

Simple merge