Merge commit 'b2b359f12465c8445484be24278b324da8ebb0e1' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 11:50:05 +0000 (12:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 11:50:05 +0000 (12:50 +0100)
commitce167a49ba706809ada8f80f600b24c12a04e510
tree5745da5f37ff3973e9655c9a4d2fa904a6ec3b79
parent4e6f1df657224d560691246cee4d596e8760fa9d
parentb2b359f12465c8445484be24278b324da8ebb0e1
Merge commit 'b2b359f12465c8445484be24278b324da8ebb0e1' into release/2.2

* commit 'b2b359f12465c8445484be24278b324da8ebb0e1':
  mdec: check for out of bounds read

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