Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Sep 2011 21:10:16 +0000 (23:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Sep 2011 21:10:26 +0000 (23:10 +0200)
* qatar/master:
  swscale: fix byte overreads in SSE-optimized hscale().
  matroskadec: fix typo.
  matroskadec: bail on parsing of incorrect seek index segments

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

Simple merge
Simple merge