CQM: fix fallback to JVT scaling lists

[ffmpeg] / libavcodec / Makefile

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 9e643675b7eb634ba3d4a492935fc37634c8025b..13f1c60abae0a05b916079588c8b41334d0b88d8 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -17,7 +17,7 @@ OBJS= bitstream.o utils.o mem.o allcodecs.o \
       ratecontrol.o adpcm.o eval.o error_resilience.o \
       fft.o mdct.o raw.o golomb.o cabac.o\
       dpcm.o adx.o faandct.o parser.o g726.o \
-      vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o dvdsub.o dvbsub.o dvbsubdec.o\
+      vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o \
       opt.o
 
 ifeq ($(CONFIG_AASC_DECODER),yes)
@@ -32,12 +32,27 @@ 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
 ifeq ($(CONFIG_CYUV_DECODER),yes)
     OBJS+= cyuv.o
 endif
+ifeq ($(CONFIG_DVBSUB_DECODER),yes)
+   OBJS+= dvbsubdec.o
+endif
+ifeq ($(CONFIG_DVBSUB_ENCODER),yes)
+   OBJS+= dvbsub.o
+endif
+ifeq ($(CONFIG_DVDSUB_DECODER),yes)
+   OBJS+= dvdsub.o
+endif
+ifeq ($(CONFIG_DVDSUB_ENCODER),yes)
+   OBJS+= dvdsubenc.o
+endif
 ifneq ($(CONFIG_DVVIDEO_DECODER)$(CONFIG_DVVIDEO_ENCODER),)
     OBJS+= dv.o
 endif
@@ -98,6 +113,9 @@ endif
 ifneq ($(CONFIG_PNG_DECODER)$(CONFIG_PNG_ENCODER),)
     OBJS+= png.o
 endif
+ifeq ($(CONFIG_QDM2_DECODER),yes)
+    OBJS+= qdm2.o
+endif
 ifeq ($(CONFIG_QDRAW_DECODER),yes)
     OBJS+= qdrw.o
 endif
@@ -140,6 +158,9 @@ endif
 ifeq ($(CONFIG_TRUEMOTION1_DECODER),yes)
     OBJS+= truemotion1.o
 endif
+ifeq ($(CONFIG_TRUEMOTION2_DECODER),yes)
+    OBJS+= truemotion2.o
+endif
 ifeq ($(CONFIG_TSCC_DECODER),yes)
     OBJS+= tscc.o
 endif
@@ -179,8 +200,10 @@ endif
 ifeq ($(CONFIG_XL_DECODER),yes)
     OBJS+= xl.o
 endif
-      
-      
+ifeq ($(CONFIG_BMP_DECODER),yes)
+       OBJS+= bmp.o
+endif
+
 AMROBJS=
 ifeq ($(AMR_NB),yes)
 ifeq ($(AMR_NB_FIXED),yes)
@@ -241,31 +264,22 @@ EXTRALIBS += -L../libavutil -lavutil$(BUILDSUF)
 ifeq ($(CONFIG_DTS),yes)
 OBJS+= dtsdec.o
 CFLAGS += $(DTS_INC)
-EXTRALIBS += -ldts
 endif
 
 ifeq ($(CONFIG_FAAD),yes)
 OBJS+= faad.o
-ifeq ($(CONFIG_FAADBIN),yes)
-# no libs needed
-else
-EXTRALIBS += -lfaad
-endif
 endif
 
 ifeq ($(CONFIG_FAAC),yes)
 OBJS+= faac.o
-EXTRALIBS += -lfaac
 endif
 
 ifeq ($(CONFIG_XVID),yes)
 OBJS+= xvidff.o
-EXTRALIBS += -lxvidcore
 endif
 
 ifeq ($(CONFIG_X264),yes)
 OBJS+= x264.o
-EXTRALIBS += -lx264
 endif
 
 ifeq ($(CONFIG_PP),yes)
@@ -279,24 +293,19 @@ endif
 
 ifeq ($(CONFIG_MP3LAME),yes)
 OBJS += mp3lameaudio.o
-EXTRALIBS += -lmp3lame
 endif
 
 ifeq ($(CONFIG_LIBOGG),yes)
 ifeq ($(CONFIG_LIBVORBIS),yes)
 OBJS += oggvorbis.o
-EXTRALIBS += -lvorbisenc -lvorbis
 endif
 ifeq ($(CONFIG_LIBTHEORA), yes)
 OBJS += oggtheora.o
-EXTRALIBS += -ltheora
 endif
-EXTRALIBS += -logg
 endif
 
 ifeq ($(CONFIG_LIBGSM),yes)
 OBJS += libgsm.o
-EXTRALIBS += -lgsm
 endif
 
 ifeq ($(TARGET_GPROF),yes)
@@ -371,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
@@ -421,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 $@ $<
@@ -479,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)"
@@ -502,8 +512,8 @@ install-headers:
        mkdir -p "$(prefix)/include/ffmpeg"
        install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \
                 "$(prefix)/include/ffmpeg"
-       install -d $(libdir)/pkgconfig
-       install -m 644 ../libavcodec.pc $(libdir)/pkgconfig
+       install -d "$(libdir)/pkgconfig"
+       install -m 644 ../libavcodec.pc "$(libdir)/pkgconfig"
 
 #
 # include dependency files if they exist