Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Jul 2012 18:29:43 +0000 (20:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Jul 2012 18:29:43 +0000 (20:29 +0200)
commit3245c8b669018c43ad4bc18cb1720cb757526b85
treea0d97815a1c6911452e3660fc494364a7146afa7
parente14052dbc8b2f6f0aef99326985e5331cfc98e08
parentfdaad6354fbf1925c9bfeadd32950c503c1103ad
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
libavformat/mxfdec.c