Merge commit '7b8c5b263bc680eff5710bee5994de39d47fc15e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jan 2013 11:43:45 +0000 (12:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jan 2013 12:01:07 +0000 (13:01 +0100)
commit6fc064893270be7549eccc78fd085ca8521ad9f2
tree6ecde3cda9eca227db9e72b76b4034c463c64a1d
parent8bfc8d88be9be07c53aa290515d022c9a938e18d
parent7b8c5b263bc680eff5710bee5994de39d47fc15e
Merge commit '7b8c5b263bc680eff5710bee5994de39d47fc15e'

* commit '7b8c5b263bc680eff5710bee5994de39d47fc15e':
  vc1dec: prevent a crash due missing pred_flag parameter
  matroska: Fix use after free

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