[FFmpeg-cvslog] Merge commit '33f10546ec012ad4e1054b57317885cded7e953e'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 19 18:18:02 2017 +0100| [d2f68be1e83d56fa6fd3be53cc9d236d39806db3] | committer: Clément Bœsch

Merge commit '33f10546ec012ad4e1054b57317885cded7e953e'

* commit '33f10546ec012ad4e1054b57317885cded7e953e':
  vc1: check that slices have a positive height

This commit is a noop, see e985cfd18bc416d3ff0c83ccafdc1ac733e6d522

Merged-by: Clément Bœsch <u at pkh.me>

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