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)
commit98b95e746668a67250baa5533d61dda7aa26bff5
treef7107979c74fbf12764d2b88053ad7f2ab2edab8
parent4624656797b667eb6405186682eb04e74dfd90fd
parentd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c
Merge commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c'

* commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c':
  aic: Improve error reporting

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