Merge commit '789f433bc6376e6e45d41ae491007d482fa1df85' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 13:01:11 +0000 (14:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Mar 2015 13:13:05 +0000 (14:13 +0100)
* commit '789f433bc6376e6e45d41ae491007d482fa1df85':
  utvideodec: Handle slice_height being zero

No change, this has been fixed privously
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge