Michael Niedermayer 77bc342975 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>

2014-03-22 22:53:33 +01:00

1.4 KiB

Raw Blame History

View Raw