CQM: fix fallback to JVT scaling lists

[ffmpeg] / libavcodec / Makefile

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index cacf074389a7bc2e9990003ea1fc2827af054cd3..13f1c60abae0a05b916079588c8b41334d0b88d8 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -32,6 +32,9 @@ endif
 ifeq ($(CONFIG_CINEPAK_DECODER),yes)
     OBJS+= cinepak.o
 endif
+ifeq ($(CONFIG_COOK_DECODER),yes)
+    OBJS+= cook.o
+endif
 ifneq ($(CONFIG_CLJR_DECODER)$(CONFIG_CLJR_ENCODER),)
     OBJS+= cljr.o
 endif
@@ -377,7 +380,7 @@ endif
 ifeq ($(TARGET_ARCH_SPARC),yes)
 OBJS+=sparc/dsputil_vis.o
 sparc/%.o: sparc/%.c
-       $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $< 
+       $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $<
 endif
 ifeq ($(TARGET_ARCH_SPARC64),yes)
 CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
@@ -427,7 +430,7 @@ libpostproc/libpostproc.a:
        $(MAKE) -C libpostproc
 
 %.o: %.c
-       $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< 
+       $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
 
 %.o: %.S
        $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
@@ -485,6 +488,7 @@ fft-test: fft-test.o $(LIB)
        $(CC) -o $@ $^ $(LIBAVUTIL) -lm
 
 ifeq ($(BUILD_SHARED),yes)
+LIBVERSION=$(LAVCMAJOR)
 install: all install-headers
 ifeq ($(CONFIG_WIN32),yes)
        install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"