Merge commit '322a1dda'
* commit '322a1dda': dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros Conflicts: libavcodec/arm/hpeldsp_init_arm.c libavcodec/x86/dsputil_x86.h Merged-by: NMichael Niedermayer <michaelni@gmx.at>
Showing
libavcodec/pixels.h
0 → 100644
想要评论请 注册 或 登录