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

Merge commit 'fa8fcab1'


* commit 'fa8fcab1':
  x86: h264_chromamc_10bit: drop pointless PAVG %define
  x86: mmx2 ---> mmxext in function names
  swscale: do not forget to swap data in formats with different endianness

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavfilter/x86/gradfun.c
	libswscale/input.c
	libswscale/utils.c
	libswscale/x86/swscale.c
	tests/ref/lavfi/pixfmts_scale

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 14f1fa56 fa8fcab1
No related branches found
No related tags found
No related merge requests found
Showing
with 235 additions and 208 deletions
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