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)
* commit 'f3dafb63d05896aacf84caf0e4c81c216476d60e':
  aic: Fix decoding files with odd dimensions

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

Simple merge