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

@@ -467,7 +467,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data,
 
     s->cur_chan = 0;
     while (s->cur_chan < s->channels) {
-        unsigned int cmd;
+        unsigned cmd;
         int len;
 
         if (get_bits_left(&s->gb) < 3+FNSIZE) {