[FFmpeg-cvslog] Merge commit '7b8c5b263bc680eff5710bee5994de39d47fc15e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 11 12:43:45 2013 +0100| [6fc064893270be7549eccc78fd085ca8521ad9f2] | committer: Michael Niedermayer

Merge commit '7b8c5b263bc680eff5710bee5994de39d47fc15e'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6fc064893270be7549eccc78fd085ca8521ad9f2
---