fixed some bugs in app parser - some jfif and adobe jpgs fixed

[ffmpeg] / libavcodec / Makefile

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 99cb8545e7c844d90934c1a7f2c2123926ec7fe4..a79111d3b7deef174d642ef399161fc0ba69d41f 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -11,11 +11,12 @@ CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_L
 LDFLAGS= -g
 
 OBJS= common.o utils.o mem.o allcodecs.o \
-      mpegvideo.o h263.o jrevdct.o jfdctfst.o \
+      mpegvideo.o h263.o jrevdct.o jfdctfst.o jfdctint.o\
       mpegaudio.o ac3enc.o mjpeg.o resample.o dsputil.o \
       motion_est.o imgconvert.o imgresample.o msmpeg4.o \
       mpeg12.o h263dec.o svq1.o rv10.o mpegaudiodec.o pcm.o simple_idct.o \
-      ratecontrol.o adpcm.o
+      ratecontrol.o adpcm.o eval.o dv.o error_resilience.o \
+      wmadec.o fft.o mdct.o mace.o
 ASM_OBJS=
 
 # currently using liba52 for ac3 decoding
@@ -34,6 +35,11 @@ OBJS += mp3lameaudio.o
 EXTRALIBS += -lmp3lame
 endif
 
+ifeq ($(CONFIG_VORBIS),yes)
+OBJS += oggvorbis.o
+EXTRALIBS += -lvorbis -lvorbisenc
+endif
+
 ifeq ($(TARGET_GPROF),yes)
 CFLAGS+=-p
 LDFLAGS+=-p
@@ -50,7 +56,7 @@ endif
 # armv4l specific stuff
 ifeq ($(TARGET_ARCH_ARMV4L),yes)
 ASM_OBJS += armv4l/jrevdct_arm.o
-OBJS += armv4l/dsputil_arm.o
+OBJS += armv4l/dsputil_arm.o armv4l/mpegvideo_arm.o
 endif
 
 # sun mediaLib specific stuff
@@ -62,9 +68,23 @@ endif
 
 # alpha specific stuff
 ifeq ($(TARGET_ARCH_ALPHA),yes)
-OBJS += alpha/dsputil_alpha.o alpha/mpegvideo_alpha.o
-ASM_OBJS += alpha/dsputil_alpha_asm.o
-CFLAGS += -Wa,-mpca56 -finline-limit=8000 -fforce-addr -freduce-all-givs
+OBJS += alpha/dsputil_alpha.o alpha/mpegvideo_alpha.o \
+       alpha/simple_idct_alpha.o alpha/motion_est_alpha.o
+ASM_OBJS += alpha/dsputil_alpha_asm.o alpha/motion_est_mvi_asm.o
+CFLAGS += -fforce-addr -freduce-all-givs
+endif
+
+ifeq ($(TARGET_ARCH_POWERPC),yes)
+OBJS += ppc/dsputil_ppc.o ppc/mpegvideo_ppc.o
+endif
+
+ifeq ($(TARGET_MMI),yes)
+OBJS += ps2/dsputil_mmi.o ps2/idct_mmi.o ps2/mpegvideo_mmi.o
+endif
+
+ifeq ($(TARGET_ALTIVEC),yes)
+CFLAGS += -faltivec
+OBJS += ppc/dsputil_altivec.o ppc/mpegvideo_altivec.o ppc/idct_altivec.o
 endif
 
 SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
@@ -74,7 +94,7 @@ LIB= libavcodec.a
 ifeq ($(BUILD_SHARED),yes)
 SLIB= libavcodec.so
 endif
-TESTS= imgresample-test dct-test motion-test
+TESTS= imgresample-test dct-test motion-test fft-test
 
 all: $(LIB) $(SLIB)
 
@@ -83,18 +103,38 @@ tests: apiexample cpuid_test $(TESTS)
 $(LIB): $(OBJS)
        rm -f $@
        $(AR) rc $@ $(OBJS)
+       $(RANLIB) $@
 
 $(SLIB): $(OBJS)
        $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
 
 dsputil.o: dsputil.c dsputil.h
 
+# specific sse code
+%_sse.o : %_sse.c
+       $(CC) $(CFLAGS) -msse -c -o $@ $< 
+
+# specific 3dnow code
+%_3dnow.o : %_3dnow.c
+       $(CC) $(CFLAGS) -m3dnow -c -o $@ $< 
+
 %.o: %.c
        $(CC) $(CFLAGS) -c -o $@ $< 
 
 %.o: %.S
        $(CC) $(CFLAGS) -c -o $@ $<
 
+# motion_est_alpha uses the MVI extension, which is not available with
+# -mcpu=ev4 (default) or ev5/ev56. Thus, force -mcpu=pca56 in those
+# cases.
+ifeq ($(TARGET_ARCH_ALPHA),yes)
+alpha/motion_est_alpha.o: alpha/motion_est_alpha.c
+       cpu=`echo "$(CFLAGS)" | sed -n 's,.*-mcpu=\([a-zA-Z0-9]*\).*,\1,p'`; \
+       case x"$$cpu" in x|xev[45]*) newcpu=pca56;; *) newcpu=$$cpu;; esac; \
+       echo $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<;\
+       $(CC) $(CFLAGS) -mcpu=$$newcpu -c -o $@ $<
+endif
+
 # depend only used by mplayer now
 dep:   depend
 
@@ -106,6 +146,8 @@ clean:
           armv4l/*.o armv4l/*~ \
           mlib/*.o mlib/*~ \
           alpha/*.o alpha/*~ \
+          ppc/*.o ppc/*~ \
+          ps2/*.o ps2/*~ \
           liba52/*.o liba52/*~ \
           apiexample $(TESTS)
 
@@ -114,7 +156,7 @@ distclean: clean
 
 # api example program
 apiexample: apiexample.c $(LIB)
-       $(CC) $(CFLAGS) -o $@ $< $(LIB) -lm
+       $(CC) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm
 
 # cpuid test
 cpuid_test: i386/cputest.c
@@ -123,23 +165,27 @@ cpuid_test: i386/cputest.c
 # testing progs
 
 imgresample-test: imgresample.c
-       $(CC) $(CFLAGS) -DTEST -o $@ $^ 
+       $(CC) $(CFLAGS) -DTEST -o $@ $^ -lm
 
-dct-test: dct-test.o jfdctfst.o i386/fdct_mmx.o \
-          fdctref.o jrevdct.o i386/idct_mmx.o
-       $(CC) -o $@ $^
+dct-test: dct-test.o jfdctfst.o jfdctint.o i386/fdct_mmx.o\
+          fdctref.o jrevdct.o i386/idct_mmx.o simple_idct.o i386/simple_idct_mmx.o
+       $(CC) -o $@ $^ -lm
 
 motion-test: motion_test.o $(LIB)
-       $(CC) -o $@ $^
+       $(CC) -o $@ $^ -lm
+
+fft-test: fft-test.o fft.o mdct.o
+       $(CC) -o $@ $^ -lm
 
 install: all
 ifeq ($(BUILD_SHARED),yes)
+       install -d $(prefix)/lib
        install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
-       ln -sf $(prefix)/lib/libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
-       ldconfig
+       ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
+       ldconfig || true
        mkdir -p $(prefix)/include/ffmpeg
-       install -m 644 avcodec.h $(prefix)/include/ffmpeg/avcodec.h
-       install -m 644 common.h $(prefix)/include/ffmpeg/common.h
+       install -m 644 $(VPATH)/avcodec.h $(prefix)/include/ffmpeg/avcodec.h
+       install -m 644 $(VPATH)/common.h $(prefix)/include/ffmpeg/common.h
 endif
 
 installlib: all