← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libav/trusty

« back to all changes in this revision

Viewing changes to libavcodec/x86/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2011-04-19 15:04:55 UTC
  • mfrom: (1.2.1 upstream)
  • mto: (1.3.4 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20110419150455-c1nac6gjm3t2aa4n
Tags: 4:0.7~b1-1
* New upstream version
* bump SONAME and SHLIBS
* configure flags --disable-stripping was removed upstream
* the MAINTAINERS file was removed upstream
* remove patch disable-configuration-warning.patch
* drop avfilter confflags, it is enable by default in 0.7
* libfaad wrapper has been removed upstream
* also update the *contents* of the lintian overrides

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/x86/Makefile
6
6
YASM-OBJS-FFT-$(HAVE_SSE)              += x86/fft_sse.o
7
7
YASM-OBJS-$(CONFIG_FFT)                += x86/fft_mmx.o                 \
8
8
                                          $(YASM-OBJS-FFT-yes)
9
 
YASM-OBJS-$(CONFIG_GPL)                += x86/h264_deblock_sse2.o       \
10
 
                                          x86/h264_idct_sse2.o          \
11
 
 
 
9
 
 
10
MMX-OBJS-$(CONFIG_H264DSP)             += x86/h264dsp_mmx.o
 
11
YASM-OBJS-$(CONFIG_H264DSP)            += x86/h264_deblock.o            \
 
12
                                          x86/h264_weight.o             \
 
13
                                          x86/h264_idct.o               \
 
14
 
 
15
YASM-OBJS-$(CONFIG_H264PRED)           += x86/h264_intrapred.o
 
16
MMX-OBJS-$(CONFIG_H264PRED)            += x86/h264_intrapred_init.o
 
17
 
 
18
YASM-OBJS-$(CONFIG_VC1_DECODER)        += x86/vc1dsp_yasm.o
 
19
 
 
20
MMX-OBJS-$(CONFIG_AC3DSP)              += x86/ac3dsp_mmx.o
 
21
YASM-OBJS-$(CONFIG_AC3DSP)             += x86/ac3dsp.o
12
22
MMX-OBJS-$(CONFIG_CAVS_DECODER)        += x86/cavsdsp_mmx.o
 
23
MMX-OBJS-$(CONFIG_MP1FLOAT_DECODER)    += x86/mpegaudiodec_mmx.o
 
24
MMX-OBJS-$(CONFIG_MP2FLOAT_DECODER)    += x86/mpegaudiodec_mmx.o
 
25
MMX-OBJS-$(CONFIG_MP3FLOAT_DECODER)    += x86/mpegaudiodec_mmx.o
 
26
MMX-OBJS-$(CONFIG_MP3ON4FLOAT_DECODER) += x86/mpegaudiodec_mmx.o
 
27
MMX-OBJS-$(CONFIG_MP3ADUFLOAT_DECODER) += x86/mpegaudiodec_mmx.o
13
28
MMX-OBJS-$(CONFIG_ENCODERS)            += x86/dsputilenc_mmx.o
 
29
YASM-OBJS-$(CONFIG_ENCODERS)           += x86/dsputilenc_yasm.o
14
30
MMX-OBJS-$(CONFIG_GPL)                 += x86/idct_mmx.o
15
31
MMX-OBJS-$(CONFIG_LPC)                 += x86/lpc_mmx.o
16
32
MMX-OBJS-$(CONFIG_DWT)                 += x86/snowdsp_mmx.o
17
33
MMX-OBJS-$(CONFIG_VC1_DECODER)         += x86/vc1dsp_mmx.o
18
 
MMX-OBJS-$(CONFIG_VP3_DECODER)         += x86/vp3dsp_mmx.o              \
19
 
                                          x86/vp3dsp_sse2.o
20
 
MMX-OBJS-$(CONFIG_VP5_DECODER)         += x86/vp3dsp_mmx.o              \
21
 
                                          x86/vp3dsp_sse2.o
22
 
MMX-OBJS-$(CONFIG_VP6_DECODER)         += x86/vp3dsp_mmx.o              \
23
 
                                          x86/vp3dsp_sse2.o             \
24
 
                                          x86/vp6dsp_mmx.o              \
25
 
                                          x86/vp6dsp_sse2.o
 
34
YASM-OBJS-$(CONFIG_VP3_DECODER)        += x86/vp3dsp.o
 
35
YASM-OBJS-$(CONFIG_VP5_DECODER)        += x86/vp3dsp.o
 
36
MMX-OBJS-$(CONFIG_VP5_DECODER)         += x86/vp56dsp_init.o
 
37
YASM-OBJS-$(CONFIG_VP6_DECODER)        += x86/vp3dsp.o                  \
 
38
                                          x86/vp56dsp.o
 
39
MMX-OBJS-$(CONFIG_VP6_DECODER)         += x86/vp56dsp_init.o
 
40
YASM-OBJS-$(CONFIG_VP8_DECODER)        += x86/vp8dsp.o
 
41
MMX-OBJS-$(CONFIG_VP8_DECODER)         += x86/vp8dsp-init.o
26
42
MMX-OBJS-$(HAVE_YASM)                  += x86/dsputil_yasm.o            \
 
43
                                          x86/deinterlace.o             \
 
44
                                          x86/fmtconvert.o              \
 
45
                                          x86/h264_chromamc.o           \
27
46
                                          $(YASM-OBJS-yes)
28
47
 
29
48
MMX-OBJS-$(CONFIG_FFT)                 += x86/fft.o
30
49
 
31
 
OBJS-$(HAVE_MMX)                       += x86/cpuid.o                   \
32
 
                                          x86/dnxhd_mmx.o               \
 
50
OBJS-$(HAVE_MMX)                       += x86/dnxhd_mmx.o               \
33
51
                                          x86/dsputil_mmx.o             \
34
52
                                          x86/fdct_mmx.o                \
 
53
                                          x86/fmtconvert_mmx.o          \
35
54
                                          x86/idct_mmx_xvid.o           \
36
55
                                          x86/idct_sse2_xvid.o          \
37
56
                                          x86/motion_est_mmx.o          \
38
57
                                          x86/mpegvideo_mmx.o           \
39
58
                                          x86/simple_idct_mmx.o         \
 
59
 
 
60
MMX-OBJS-$(CONFIG_DCT)                 += x86/dct32_sse.o