-
Michael Niedermayer authored
* commit 'e0a2e60c': dct-test: Reuse enum idct_permutation_type instead of duplicating it Conflicts: libavcodec/dct-test.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
a86d527c
* commit 'e0a2e60c': dct-test: Reuse enum idct_permutation_type instead of duplicating it Conflicts: libavcodec/dct-test.c Merged-by: Michael Niedermayer <michaelni@gmx.at>