diff options
| author | Elvis Presley <elvis@e.p> | 2011-10-12 19:10:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-12 19:55:25 +0200 |
| commit | bebaf4ea1f72b5de523e8548b12d7ad79bdcaf01 (patch) | |
| tree | 3a206fc8d32f95ebbeea95341a96e775bff29a8b /libavcodec/Makefile | |
| parent | b87d882578807e9a45848a528891bd82a5165712 (diff) | |
prores: change license to LGPL, merge some parts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 78a0a300b3..8a1774a758 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -313,7 +313,7 @@ OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o -OBJS-$(CONFIG_PRORES_GPL_DECODER) += proresdec_gpl.o +OBJS-$(CONFIG_PRORES_DECODER) += proresdec.o OBJS-$(CONFIG_PRORES_LGPL_DECODER) += proresdec_lgpl.o proresdsp.o OBJS-$(CONFIG_PTX_DECODER) += ptx.o OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o celp_math.o \ |