Merge commit 'f3dafb63d05896aacf84caf0e4c81c216476d60e' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:31:23 +0000 (00:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 23:31:23 +0000 (00:31 +0100)
commite2c82f7d9362192671bff9959303892107c5d114
tree6d44ecf17b1c0f002322b1d1524732b40607f5d6
parentd208977cd1c47ddc0281186a6f0521b4b4bd6c1a
parentf3dafb63d05896aacf84caf0e4c81c216476d60e
Merge commit 'f3dafb63d05896aacf84caf0e4c81c216476d60e' into release/2.4

* commit 'f3dafb63d05896aacf84caf0e4c81c216476d60e':
  aic: Fix decoding files with odd dimensions

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