Merge commit '303ec065a90498c29d384b4add2ac626bc38d5eb'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 19:19:16 +0000 (21:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 19:19:22 +0000 (21:19 +0200)
* commit '303ec065a90498c29d384b4add2ac626bc38d5eb':
  aic: Fix slice size computation for widths multiples of 32 macroblocks

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

Simple merge