Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Apr 2012 19:45:41 +0000 (21:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Apr 2012 19:45:54 +0000 (21:45 +0200)
commitdfa07e89289b25d44b6f2b959130077913921e0a
treeb83687405107f879c20b2ccc3dd66d6db35ae4fa
parent46eba43e0ef28d9d08ed41774e6bd1ce94388c35
parentacb2c79c2102026747468dcafa6780ab1094b3c5
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  4xm: fix invalid array indexing
  rv34dsp: factorize a multiplication in the noround inverse transform
  rv40: perform bitwise checks in loop filter
  rv34: remove inline keyword from rv34_decode_block().
  rv40: change a logical test into a bitwise one.
  rv34: remove constant parameter
  rv40: don't always do the full prev_type search
  dsputil x86: revert a test back to its previous value
  rv34dsp x86: implement MMX2 inverse transform

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/4xm.c
libavcodec/rv34.c
libavcodec/rv40.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/rv34dsp.asm