Skip to content
Snippets Groups Projects
Commit 77bc3429 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 672c610d 322a1dda
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment