Merge commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 May 2013 11:55:23 +0000 (13:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 May 2013 11:55:31 +0000 (13:55 +0200)
* commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087':
  x86: rnd_template: Eliminate pointless OP_AVG macro indirection

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/hpeldsp_rnd_template.c
libavcodec/x86/rnd_template.c

Simple merge
Simple merge
Simple merge
Simple merge