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)
* 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>
1  2 
libavcodec/shorten.c

Simple merge