[FFmpeg-cvslog] Merge commit '303ec065a90498c29d384b4add2ac626bc38d5eb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 30 21:19:16 2015 +0200| [4ff0c61ba80016bdda4ca3002c381a9f2f3cc8c8] | committer: Michael Niedermayer

Merge commit '303ec065a90498c29d384b4add2ac626bc38d5eb'

* commit '303ec065a90498c29d384b4add2ac626bc38d5eb':
  aic: Fix slice size computation for widths multiples of 32 macroblocks

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

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