[FFmpeg-cvslog] Merge commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 02:01:39 2015 +0100| [b02323017090b8e19e48214d917ccf1bd9b58876] | committer: Michael Niedermayer

Merge commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d'

* commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d':
  utvideodec: Handle slice_height being zero

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

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