Michael Niedermayer 6bef3e55bd Merge commit '009331303a6462d07cbe94aef9c446f1a1695519' ...

* commit '009331303a6462d07cbe94aef9c446f1a1695519':
  x86: huffyuvdsp: Move inline assembly to init file

Conflicts:
	libavcodec/x86/Makefile
	libavcodec/x86/huffyuvdsp.h
	libavcodec/x86/huffyuvdsp_init.c
	libavcodec/x86/huffyuvdsp_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-07-05 19:11:26 +02:00

4.5 KiB

Raw Blame History

View Raw