Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mxfdec: replace x>>av_log2(sizeof(..)) by x/sizeof(..).
  x86: h264_intrapred: Don't add the 'd' suffix to the SPLATB_REG macro

Conflicts:
	libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/x86/h264_intrapred.asm

@@ -156,7 +156,7 @@ cglobal pred16x16_dc, 2,7
 %if cpuflag(ssse3)
     pxor       m1, m1
 %endif
-    SPLATB_REG m0, r2d, m1
+    SPLATB_REG m0, r2, m1
 
 %if mmsize==8
     mov       r3d, 8

libavformat/mxfdec.c

@@ -730,6 +730,7 @@ static int mxf_read_index_entry_array(AVIOContext *pb, MXFIndexTableSegment *seg
     int i, length;
 
     segment->nb_index_entries = avio_rb32(pb);
+
     length = avio_rb32(pb);
 
     if (!(segment->temporal_offset_entries=av_calloc(segment->nb_index_entries, sizeof(*segment->temporal_offset_entries))) ||