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

Merge commit 'f56d8d8d' 


* commit 'f56d8d8d':
  h264: aarch64: intra prediction optimisations

Conflicts:
	libavcodec/h264pred.c

Merged-by: default avatarMichael Niedermayer <michael@niedermayer.cc>
parents 495eee01 f56d8d8d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment