Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 21:30:20 +0000 (22:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 21:53:33 +0000 (22:53 +0100)
commit77bc34297596476c1644a497615038d18eed63fe
tree901172b5bb0d19d05710e6c144425173dcec9022
parent672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3
parent322a1dda973e802db7b57f2007fad3efcd5bab81
Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'

* commit '322a1dda973e802db7b57f2007fad3efcd5bab81':
  dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros

Conflicts:
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/hpel_template.c
libavcodec/hpeldsp_template.c
libavcodec/pixels.h
libavcodec/rnd_avg.h
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
libavcodec/x86/h264_qpel.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/rnd_mmx.c