Give more meaningful message on BMP header parsing error

[ffmpeg] / libavcodec / Makefile

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 1c5999f37b5000f45f964c3b6f518b6fd0c6feca..500bd34c6387824e4a94515de47b1aa46387b15a 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -3,6 +3,8 @@ include $(SUBDIR)../config.mak
 NAME = avcodec
 FFLIBS = avutil
 
+HEADERS = avcodec.h opt.h
+
 OBJS = allcodecs.o                                                      \
        audioconvert.o                                                   \
        bitstream.o                                                      \
@@ -20,9 +22,6 @@ OBJS = allcodecs.o                                                      \
        simple_idct.o                                                    \
        utils.o                                                          \
 
-
-HEADERS = avcodec.h opt.h
-
 # parts needed for many different codecs
 OBJS-$(CONFIG_ENCODERS)                += faandct.o jfdctfst.o jfdctint.o
 OBJS-$(CONFIG_FFT)                     += fft.o
@@ -390,6 +389,20 @@ OBJS-$(HAVE_W32THREADS)                += w32thread.o
 OBJS-$(HAVE_XVMC)                      += xvmcvideo.o
 
 # processor-specific code
+MMX-OBJS-$(CONFIG_CAVS_DECODER)        += i386/cavsdsp_mmx.o
+MMX-OBJS-$(CONFIG_ENCODERS)            += i386/dsputilenc_mmx.o
+MMX-OBJS-$(CONFIG_FLAC_ENCODER)        += i386/flacdsp_mmx.o
+MMX-OBJS-$(CONFIG_GPL)                 += i386/idct_mmx.o
+MMX-OBJS-$(CONFIG_SNOW_DECODER)        += i386/snowdsp_mmx.o
+MMX-OBJS-$(CONFIG_VC1_DECODER)         += i386/vc1dsp_mmx.o
+MMX-OBJS-$(CONFIG_VP3_DECODER)         += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
+MMX-OBJS-$(CONFIG_VP5_DECODER)         += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
+MMX-OBJS-$(CONFIG_VP6_DECODER)         += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
+MMX-OBJS-$(CONFIG_VP6A_DECODER)        += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
+MMX-OBJS-$(CONFIG_VP6F_DECODER)        += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
+MMX-OBJS-$(CONFIG_WMV3_DECODER)        += i386/vc1dsp_mmx.o
+MMX-OBJS-$(HAVE_YASM)                  += i386/dsputil_yasm.o
+
 OBJS-$(HAVE_MMX)                       += i386/cpuid.o                  \
                                           i386/dsputil_mmx.o            \
                                           i386/fdct_mmx.o               \
@@ -398,28 +411,13 @@ OBJS-$(HAVE_MMX)                       += i386/cpuid.o                  \
                                           i386/motion_est_mmx.o         \
                                           i386/mpegvideo_mmx.o          \
                                           i386/simple_idct_mmx.o        \
+                                          $(MMX-OBJS-yes)
 
-ifdef HAVE_MMX
-OBJS-$(CONFIG_CAVS_DECODER)            += i386/cavsdsp_mmx.o
-OBJS-$(CONFIG_ENCODERS)                += i386/dsputilenc_mmx.o
 OBJS-$(CONFIG_FFT_MMX)                 += i386/fft_3dn.o                \
                                           i386/fft_3dn2.o               \
                                           i386/fft_mmx.o                \
                                           i386/fft_sse.o                \
 
-OBJS-$(CONFIG_FLAC_ENCODER)            += i386/flacdsp_mmx.o
-OBJS-$(CONFIG_GPL)                     += i386/idct_mmx.o
-OBJS-$(CONFIG_SNOW_DECODER)            += i386/snowdsp_mmx.o
-OBJS-$(CONFIG_VC1_DECODER)             += i386/vc1dsp_mmx.o
-OBJS-$(CONFIG_VP3_DECODER)             += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
-OBJS-$(CONFIG_VP5_DECODER)             += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
-OBJS-$(CONFIG_VP6_DECODER)             += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
-OBJS-$(CONFIG_VP6A_DECODER)            += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
-OBJS-$(CONFIG_VP6F_DECODER)            += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
-OBJS-$(CONFIG_WMV3_DECODER)            += i386/vc1dsp_mmx.o
-OBJS-$(HAVE_YASM)                      += i386/dsputil_yasm.o
-endif
-
 OBJS-$(ARCH_ALPHA)                     += alpha/dsputil_alpha.o         \
                                           alpha/dsputil_alpha_asm.o     \
                                           alpha/motion_est_alpha.o      \
@@ -434,6 +432,7 @@ OBJS-$(ARCH_ARMV4L)                    += armv4l/dsputil_arm.o          \
                                           armv4l/simple_idct_arm.o      \
 
 OBJS-$(HAVE_ARMV5TE)                   += armv4l/mpegvideo_armv5te.o    \
+                                          armv4l/mpegvideo_armv5te_s.o  \
                                           armv4l/simple_idct_armv5te.o  \
 
 OBJS-$(HAVE_ARMV6)                     += armv4l/simple_idct_armv6.o    \