-
Michael Niedermayer authored
* commit '746ad4e0': dct-test: Improve CPU flags struct member name Conflicts: libavcodec/dct-test.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
29119aff
* commit '746ad4e0': dct-test: Improve CPU flags struct member name Conflicts: libavcodec/dct-test.c Merged-by:Michael Niedermayer <michaelni@gmx.at>