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

Merge commit 'f9279ee7' 


* commit 'f9279ee7':
  dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h

Conflicts:
	libavcodec/imgconvert.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents d6d3cfb0 f9279ee7
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 21 additions and 14 deletions
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