Merge commit '43bacd5b7d3d265a77cd29d8abb131057796aecc'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:02:33 +0000 (16:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:07:37 +0000 (16:07 +0200)
commit91062ddef18e94d54e4b37b288c77c11947d8756
treefe6cd81b188e5b040ef4e6a98bd943675ca16164
parentf606c6e92c63e914d3e44052fde9005d5bec1249
parent43bacd5b7d3d265a77cd29d8abb131057796aecc
Merge commit '43bacd5b7d3d265a77cd29d8abb131057796aecc'

* commit '43bacd5b7d3d265a77cd29d8abb131057796aecc':
  vc1: check mb_height validity.

See: b5f4836f8cb374f1a5ae45db48b61a1dfba0daad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vc1dec.c