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>

diff --cc libavcodec/4xm.c
Simple merge

diff --cc libavcodec/rv34.c
Simple merge

diff --cc libavcodec/rv40.c
index e7390fb,695b029..a0940b3
--- 1/libavcodec/rv40.c
--- 2/libavcodec/rv40.c
+++ b/libavcodec/rv40.c
@@@ -228,14 -228,9 +228,12 @@@ static int rv40_decode_mb_info(RV34DecC
      int q, i;
      int prev_type = 0;
      int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
-     int blocks[RV34_MB_TYPES] = {0};
-     int count = 0;
  
 -    if(!r->s.mb_skip_run)
 +    if(!r->s.mb_skip_run) {
          r->s.mb_skip_run = svq3_get_ue_golomb(gb) + 1;
 +        if(r->s.mb_skip_run > (unsigned)s->mb_num)
 +            return -1;
 +    }
  
      if(--r->s.mb_skip_run)
           return RV34_MB_SKIP;

diff --cc libavcodec/x86/dsputil_mmx.c
Simple merge

diff --cc libavcodec/x86/rv34dsp.asm
Simple merge