Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Dec 2011 01:04:00 +0000 (02:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Dec 2011 01:04:00 +0000 (02:04 +0100)
commitff4800c16bae15817b35eaa22d0113849849114b
tree123864d2f3118a00ba05995aa956838dde208a04
parentd9ced9fec63e7363a52e4b2e7c3f7d2197256f38
parent4d9ec050a21c953f5a6e31483cf5ebd344afa3fd
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Code cleanup - mpegvideo.c - 500-1000line
  rv40: NEON optimised weighted prediction
  rv40: NEON optimised chroma MC
  ARM: move NEON H264 chroma mc to a separate file
  rv34: NEON optimised inverse transform functions

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/Makefile
libavcodec/arm/h264dsp_neon.S
libavcodec/mpegvideo.c
libavcodec/rv40dsp.c