Merge commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 01:01:39 +0000 (02:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 01:04:13 +0000 (02:04 +0100)
commitb02323017090b8e19e48214d917ccf1bd9b58876
tree7b748d69f420ba6b2fd8a62433b194addf60d1ad
parentfa14685a578d4d37f9a53c2399bba7770e48f747
parent0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d
Merge commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d'

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

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