]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '33f10546ec012ad4e1054b57317885cded7e953e'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 17:18:02 +0000 (18:18 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 17:18:02 +0000 (18:18 +0100)
* commit '33f10546ec012ad4e1054b57317885cded7e953e':
  vc1: check that slices have a positive height

This commit is a noop, see e985cfd18bc416d3ff0c83ccafdc1ac733e6d522

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

Trivial merge