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

Merge commit '0e730494' 


* commit '0e730494':
  avfilter: x86: Port gradfun filter optimizations to yasm

Conflicts:
	libavfilter/x86/vf_gradfun_init.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 04916953 0e730494
No related branches found
No related tags 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