Merge commit '335ec616cc38ee6206a3acebd46d01aad73d721b' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 22:11:29 +0000 (23:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 22:11:51 +0000 (23:11 +0100)
* commit '335ec616cc38ee6206a3acebd46d01aad73d721b':
  utvideodec: Handle slice_height being zero

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

Simple merge