From bebaf4ea1f72b5de523e8548b12d7ad79bdcaf01 Mon Sep 17 00:00:00 2001 From: Elvis Presley Date: Wed, 12 Oct 2011 19:10:22 +0200 Subject: prores: change license to LGPL, merge some parts. Signed-off-by: Michael Niedermayer --- libavcodec/x86/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libavcodec/x86/Makefile') diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index d031f6505b..3ae63ececb 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -36,6 +36,8 @@ MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o YASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o MMX-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp-init.o +YASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o +MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp-init.o MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp_mmx.o MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o YASM-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp.o -- cgit v1.2.3