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

Merge commit 'e0a2e60c' 


* commit 'e0a2e60c':
  dct-test: Reuse enum idct_permutation_type instead of duplicating it

Conflicts:
	libavcodec/dct-test.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 69c7aad4 e0a2e60c
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 43 additions and 35 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