-
Michael Niedermayer authored
* commit '4f8cf0dc': x86: build: Restore ordering of OBJS lines Conflicts: libavcodec/x86/Makefile Merged-by:
Michael Niedermayer <michaelni@gmx.at>
a91c5ed0
* commit '4f8cf0dc': x86: build: Restore ordering of OBJS lines Conflicts: libavcodec/x86/Makefile Merged-by:Michael Niedermayer <michaelni@gmx.at>