Merge commit 'e878ec0d47cd6228c367b2f3128b76d7523f7255'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Mar 2015 19:20:49 +0000 (20:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Mar 2015 19:41:44 +0000 (20:41 +0100)
commit75dbe4c1fa2c81b2c5cf6436295a143bdecb9e70
tree3f975f83ef519071b024b9a8d2e3230435468ad2
parentc285937ccc98109d0b5d4ba2e0560ebbb81f580f
parente878ec0d47cd6228c367b2f3128b76d7523f7255
Merge commit 'e878ec0d47cd6228c367b2f3128b76d7523f7255'

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

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