]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit '7b8c5b263bc680eff5710bee5994de39d47fc15e':
  vc1dec: prevent a crash due missing pred_flag parameter
  matroska: Fix use after free

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

Simple merge
Simple merge