Merge commit 'b701e26a4e89e3816490bc74bc47f82e6b7f7002' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:18:20 +0000 (16:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:18:24 +0000 (16:18 +0200)
commitfa73d13678c49f2e68a445577b48ba3c2e615e19
treea918890a56b30b72857854fd2bab46bc8be54d8b
parent8401ed651b2c6b089ebb6d5afbf05e662dfbf87e
parentb701e26a4e89e3816490bc74bc47f82e6b7f7002
Merge commit 'b701e26a4e89e3816490bc74bc47f82e6b7f7002' into release/1.1

* commit 'b701e26a4e89e3816490bc74bc47f82e6b7f7002':
  mpeg12: check scantable indices in all decode_block functions

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