diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-05 18:54:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-05 19:11:26 +0200 |
| commit | 6bef3e55bdc743ea81694c90f443ac2a089ddabc (patch) | |
| tree | 9d45b500d6f0bdb0cb7b15020acb1e5cc510208e /libavcodec/x86/Makefile | |
| parent | d3e51b4118585fbd4c314931bdf97502aeeee6d4 (diff) | |
| parent | 009331303a6462d07cbe94aef9c446f1a1695519 (diff) | |
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>
Diffstat (limited to 'libavcodec/x86/Makefile')
| -rw-r--r-- | libavcodec/x86/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index f43d54657c..a25e80c62b 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -60,7 +60,6 @@ OBJS-$(CONFIG_WEBP_DECODER) += x86/vp8dsp_init.o MMX-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_mmx.o MMX-OBJS-$(CONFIG_DIRAC_DECODER) += x86/dirac_dwt.o -MMX-OBJS-$(CONFIG_HUFFYUVDSP) += x86/huffyuvdsp_mmx.o MMX-OBJS-$(CONFIG_IDCTDSP) += x86/idctdsp_mmx.o \ x86/idct_mmx_xvid.o \ x86/idct_sse2_xvid.o \ |