Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jan 2013 13:25:19 +0000 (14:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jan 2013 13:25:19 +0000 (14:25 +0100)
commit1146bbc5a630db5169e51a9185292f88b1de6933
tree0fb2b2e736b36a2dac5e06d0b85ebdaf802c59dd
parentbb2f4ae434223e99f131100f4bc71762b79eb6c5
parent834e9fb0563956630e4d9bf61c9242ad134334da
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: hpeldsp: Fix a typo, use the right register
  shorten: fix array subscript is below array bounds warning

Conflicts:
libavcodec/shorten.c

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