[FFmpeg-cvslog] Merge commit 'e878ec0d47cd6228c367b2f3128b76d7523f7255'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar  3 20:20:49 2015 +0100| [75dbe4c1fa2c81b2c5cf6436295a143bdecb9e70] | committer: Michael Niedermayer

Merge commit 'e878ec0d47cd6228c367b2f3128b76d7523f7255'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75dbe4c1fa2c81b2c5cf6436295a143bdecb9e70
---