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)
commit4ff0c61ba80016bdda4ca3002c381a9f2f3cc8c8
tree267158afe5998e5f40232e0a9e0f2478e54931d3
parent2e9dcb82e5d54f54befe3c42b4d0bc9a6bd47016
parent303ec065a90498c29d384b4add2ac626bc38d5eb
Merge commit '303ec065a90498c29d384b4add2ac626bc38d5eb'

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

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