Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 14 May 2013 08:18:46 +0000 (10:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 14 May 2013 08:18:46 +0000 (10:18 +0200)
* commit '46bb456853b197f4562de7acf5d42abf11ded9be':
  x86: dsputil: Refactor pixels16 wrapper functions with a macro

Conflicts:
libavcodec/x86/hpeldsp_avg_template.c

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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge