sigrid/ffmpeg

Makefile+4−3

 	@-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n'
 	@-tput sgr0 2>/dev/null
-SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
+SUBDIR_VARS := CLEANFILES DIRS EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \
-               ALTIVEC-OBJS MMX-OBJS NEON-OBJS YASM-OBJS                  \
+               ARCH_HEADERS BUILT_HEADERS SKIPHEADERS                    \
-               HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS ARMV6-OBJS TOOLS
+               ALTIVEC-OBJS ARMV6-OBJS MMX-OBJS NEON-OBJS YASM-OBJS      \
+               OBJS TESTOBJS
 define RESET
 $(1) :=

libavcodec/alpha/Makefile+6−6

@@ -1,6 +1,6 @@
1	OBJS += alpha/dsputil_alpha.o \	1	OBJS += alpha/dsputil_alpha.o \
2	alpha/dsputil_alpha_asm.o \	2	alpha/dsputil_alpha_asm.o \
3	alpha/motion_est_alpha.o \	3	alpha/motion_est_alpha.o \
4	alpha/motion_est_mvi_asm.o \	4	alpha/motion_est_mvi_asm.o \
5	alpha/mpegvideo_alpha.o \	5	alpha/mpegvideo_alpha.o \
6	alpha/simple_idct_alpha.o \	6	alpha/simple_idct_alpha.o \

libavcodec/bfin/Makefile+7−7

@@ -1,7 +1,7 @@
1	OBJS += bfin/dsputil_bfin.o \	1	OBJS += bfin/dsputil_bfin.o \
2	bfin/fdct_bfin.o \	2	bfin/fdct_bfin.o \
3	bfin/idct_bfin.o \	3	bfin/idct_bfin.o \
4	bfin/mpegvideo_bfin.o \	4	bfin/mpegvideo_bfin.o \
5	bfin/pixels_bfin.o \	5	bfin/pixels_bfin.o \
6	bfin/vp3_bfin.o \	6	bfin/vp3_bfin.o \
7	bfin/vp3_idct_bfin.o \	7	bfin/vp3_idct_bfin.o \

libavcodec/ppc/Makefile+4−7

 OBJS                                   += ppc/dsputil_ppc.o             \
+FFT-OBJS-$(HAVE_GNU_AS)                += ppc/fft_altivec_s.o           \
+ALTIVEC-OBJS-$(CONFIG_FFT)             += ppc/fft_altivec.o             \
+                                          $(FFT-OBJS-yes)
 ALTIVEC-OBJS-$(CONFIG_H264DSP)         += ppc/h264_altivec.o
+ALTIVEC-OBJS-$(CONFIG_MPEGAUDIODSP)    += ppc/mpegaudiodec_altivec.o
 ALTIVEC-OBJS-$(CONFIG_VC1_DECODER)     += ppc/vc1dsp_altivec.o
 ALTIVEC-OBJS-$(CONFIG_VP3_DECODER)     += ppc/vp3dsp_altivec.o
 ALTIVEC-OBJS-$(CONFIG_VP5_DECODER)     += ppc/vp3dsp_altivec.o
 ALTIVEC-OBJS-$(CONFIG_VP6_DECODER)     += ppc/vp3dsp_altivec.o
 ALTIVEC-OBJS-$(CONFIG_VP8_DECODER)     += ppc/vp8dsp_altivec.o
-ALTIVEC-OBJS-$(CONFIG_MPEGAUDIODSP)    += ppc/mpegaudiodec_altivec.o
-FFT-OBJS-$(HAVE_GNU_AS)                += ppc/fft_altivec_s.o           \
-ALTIVEC-OBJS-$(CONFIG_FFT)             += ppc/fft_altivec.o             \
-                                          $(FFT-OBJS-yes)
 OBJS-$(HAVE_ALTIVEC)                   += ppc/dsputil_altivec.o         \
                                           ppc/fdct_altivec.o            \
                                           ppc/float_altivec.o           \

libavcodec/sh4/Makefile+3−3

@@ -1,3 +1,3 @@
1	OBJS += sh4/dsputil_align.o \	1	OBJS += sh4/dsputil_align.o \
2	sh4/dsputil_sh4.o \	2	sh4/dsputil_sh4.o \
3	sh4/idct_sh4.o \	3	sh4/idct_sh4.o \

libavcodec/sparc/Makefile+2−2

@@ -1,2 +1,2 @@
1	OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \	1	OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \
2	sparc/simple_idct_vis.o \	2	sparc/simple_idct_vis.o \

libavcodec/x86/Makefile+40−47

@@ -1,79 +1,72 @@
1	OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o	1	OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
2	OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o	2	OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o
		3	OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
3		4
4	YASM-OBJS-$(CONFIG_DCT) += x86/dct32_sse.o	5	OBJS-$(HAVE_MMX) += x86/dsputil_mmx.o \
		6	x86/fdct_mmx.o \
		7	x86/fmtconvert_mmx.o \
		8	x86/idct_mmx_xvid.o \
		9	x86/idct_sse2_xvid.o \
		10	x86/motion_est_mmx.o \
		11	x86/mpegvideo_mmx.o \
		12	x86/simple_idct_mmx.o \
5		13
		14	MMX-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o
		15	MMX-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_mmx.o
		16	MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o
		17	MMX-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhd_mmx.o
		18	MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp_mmx.o
		19	MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o
		20	MMX-OBJS-$(CONFIG_FFT) += x86/fft.o
		21	MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o
		22	MMX-OBJS-$(CONFIG_H264DSP) += x86/h264dsp_mmx.o
		23	MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o
		24	MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o
		25	MMX-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec_mmx.o
		26	MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp-init.o
		27	MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp-init.o
		28	MMX-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp_init.o
		29	MMX-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp_init.o \
		30	x86/rv40dsp_init.o
		31	MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o
		32	MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp56dsp_init.o
		33	MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o
		34	MMX-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp-init.o
		35
		36	YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o
		37	YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o
		38	YASM-OBJS-$(CONFIG_DCT) += x86/dct32_sse.o
		39	YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_yasm.o
6	YASM-OBJS-FFT-$(HAVE_AMD3DNOW) += x86/fft_3dn.o	40	YASM-OBJS-FFT-$(HAVE_AMD3DNOW) += x86/fft_3dn.o
7	YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT) += x86/fft_3dn2.o	41	YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT) += x86/fft_3dn2.o
8	YASM-OBJS-FFT-$(HAVE_SSE) += x86/fft_sse.o	42	YASM-OBJS-FFT-$(HAVE_SSE) += x86/fft_sse.o
9	YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o \	43	YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o \
10	$(YASM-OBJS-FFT-yes)	44	$(YASM-OBJS-FFT-yes)
11
12	YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \	45	YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \
13	x86/h264_chromamc_10bit.o	46	x86/h264_chromamc_10bit.o
14
15	MMX-OBJS-$(CONFIG_H264DSP) += x86/h264dsp_mmx.o
16	YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock.o \	47	YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock.o \
17	x86/h264_deblock_10bit.o \	48	x86/h264_deblock_10bit.o \
18	x86/h264_idct.o \	49	x86/h264_idct.o \
19	x86/h264_idct_10bit.o \	50	x86/h264_idct_10bit.o \
20	x86/h264_weight.o \	51	x86/h264_weight.o \
21	x86/h264_weight_10bit.o \	52	x86/h264_weight_10bit.o
22
23	YASM-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred.o \	53	YASM-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred.o \
24	x86/h264_intrapred_10bit.o	54	x86/h264_intrapred_10bit.o
25	MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o
26	YASM-OBJS-$(CONFIG_H264QPEL) += x86/h264_qpel_10bit.o	55	YASM-OBJS-$(CONFIG_H264QPEL) += x86/h264_qpel_10bit.o
27		56	YASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36_sse.o
28	MMX-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp_init.o	57	YASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o
		58	YASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o
29	YASM-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp.o	59	YASM-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp.o
30	MMX-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp_init.o \
31	x86/rv40dsp_init.o
32	YASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp.o \	60	YASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp.o \
33	x86/rv40dsp.o	61	x86/rv40dsp.o
34
35	YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_yasm.o	62	YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_yasm.o
36
37	MMX-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_mmx.o
38	YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o
39	MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o
40	MMX-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhd_mmx.o
41	MMX-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec_mmx.o
42	YASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36_sse.o
43	MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o
44	YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_yasm.o
45	MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o
46	MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o
47	YASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o
48	MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp-init.o
49	YASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o
50	MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp-init.o
51	MMX-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o
52	YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o
53	MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp_mmx.o
54	MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o
55	YASM-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp.o	63	YASM-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp.o
56	YASM-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp.o	64	YASM-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp.o
57	MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp56dsp_init.o
58	YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp3dsp.o \	65	YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp3dsp.o \
59	x86/vp56dsp.o	66	x86/vp56dsp.o
60	MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o
61	YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o	67	YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o
62	MMX-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp-init.o	68
63	MMX-OBJS-$(HAVE_YASM) += x86/dsputil_yasm.o \	69	MMX-OBJS-$(HAVE_YASM) += x86/dsputil_yasm.o \
64	x86/deinterlace.o \	70	x86/deinterlace.o \
65	x86/fmtconvert.o \	71	x86/fmtconvert.o \
66	$(YASM-OBJS-yes)	72	$(YASM-OBJS-yes)
67
68	MMX-OBJS-$(CONFIG_FFT) += x86/fft.o
69
70	OBJS-$(HAVE_MMX) += x86/dsputil_mmx.o \
71	x86/fdct_mmx.o \
72	x86/fmtconvert_mmx.o \
73	x86/idct_mmx_xvid.o \
74	x86/idct_sse2_xvid.o \
75	x86/motion_est_mmx.o \
76	x86/mpegvideo_mmx.o \
77	x86/simple_idct_mmx.o \
78
79	OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o

libavformat/Makefile+2−2

 HEADERS = avformat.h avio.h version.h
 OBJS = allformats.o         \
+       avio.o               \
+       aviobuf.o            \
        cutils.o             \
        id3v1.o              \
        id3v2.o              \
 OBJS-$(CONFIG_LIBRTMP)                   += librtmp.o
 # protocols I/O
-OBJS+= avio.o aviobuf.o
 OBJS-$(CONFIG_APPLEHTTP_PROTOCOL)        += hlsproto.o
 OBJS-$(CONFIG_CONCAT_PROTOCOL)           += concat.o
 OBJS-$(CONFIG_CRYPTO_PROTOCOL)           += crypto.o

libswscale/Makefile+8−2

 HEADERS = swscale.h
-OBJS = input.o options.o output.o rgb2rgb.o swscale.o \
+OBJS = input.o                                          \
-       swscale_unscaled.o utils.o yuv2rgb.o
+       options.o                                        \
+       output.o                                         \
+       rgb2rgb.o                                        \
+       swscale.o                                        \
+       swscale_unscaled.o                               \
+       utils.o                                          \
+       yuv2rgb.o                                        \
 OBJS-$(ARCH_BFIN)          +=  bfin/internal_bfin.o     \
                                bfin/swscale_bfin.o      \

build: prettyprinting cosmetics

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code