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)
commit62101030c4ff23c61046a70cd27a627dfb0e0e54
tree8837cb836ad73deea83be440cc8d315ba2f601ce
parente78d1a594a0a4942b2c39170df10b9f36f9b8d08
parentea540401d6082474df8364169e2041e29e4dc407
Merge remote-tracking branch 'qatar/master'

* 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>
libavformat/matroskadec.c
libswscale/utils.c