summaryrefslogtreecommitdiff
path: root/libavcodec/pixels.h
Commit message (Collapse)AuthorAge
* Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'Michael Niedermayer2014-03-22
| | | | | | | | | | | * 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>
* dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macrosDiego Biurrun2014-03-22