Merge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 May 2013 18:59:52 +0000 (20:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 May 2013 19:00:40 +0000 (21:00 +0200)
commit108e2ae8299a221e78c549a69c09a5eb1cebbd6c
tree49d7c9772d07f0161735a88310c68145ea90262c
parenta6e782434a218a51b243c00c2b844b7abb4d4509
parent110796739ab32854dc0b6b0a1c95e6ae98889062
Merge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'

* commit '110796739ab32854dc0b6b0a1c95e6ae98889062':
  x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.h
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/hpeldsp_mmx.c
libavcodec/x86/hpeldsp_rnd_template.c