mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-18 03:19:31 +02:00
c581cb4e4f
* qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
76 lines
4.4 KiB
Makefile
76 lines
4.4 KiB
Makefile
OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
|
|
OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o
|
|
OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp_init.o
|
|
OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
|
|
|
|
MMX-OBJS += x86/dsputil_mmx.o \
|
|
x86/fdct_mmx.o \
|
|
x86/fmtconvert_init.o \
|
|
x86/idct_mmx_xvid.o \
|
|
x86/idct_sse2_xvid.o \
|
|
x86/motion_est_mmx.o \
|
|
x86/mpegvideo_mmx.o \
|
|
x86/simple_idct_mmx.o \
|
|
|
|
MMX-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o
|
|
MMX-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o
|
|
MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o
|
|
MMX-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhd_mmx.o
|
|
MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp_mmx.o \
|
|
x86/dwt.o
|
|
MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o
|
|
MMX-OBJS-$(CONFIG_FFT) += x86/fft_init.o
|
|
MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o
|
|
MMX-OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o
|
|
MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o
|
|
MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o
|
|
MMX-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec_mmx.o
|
|
MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o
|
|
MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o
|
|
MMX-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp_init.o
|
|
MMX-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp_init.o
|
|
MMX-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp_init.o \
|
|
x86/rv40dsp_init.o
|
|
MMX-OBJS-$(CONFIG_V210_DECODER) += x86/v210-init.o
|
|
MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o
|
|
MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp56dsp_init.o
|
|
MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp_init.o
|
|
MMX-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o
|
|
|
|
YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o
|
|
YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o
|
|
YASM-OBJS-$(CONFIG_DCT) += x86/dct32_sse.o
|
|
YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o
|
|
YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o
|
|
YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o \
|
|
$(YASM-OBJS-FFT-yes)
|
|
|
|
YASM-OBJS-$(CONFIG_DWT) += x86/dwt_yasm.o
|
|
YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \
|
|
x86/h264_chromamc_10bit.o
|
|
YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock.o \
|
|
x86/h264_deblock_10bit.o \
|
|
x86/h264_idct.o \
|
|
x86/h264_idct_10bit.o \
|
|
x86/h264_weight.o \
|
|
x86/h264_weight_10bit.o
|
|
YASM-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred.o \
|
|
x86/h264_intrapred_10bit.o
|
|
YASM-OBJS-$(CONFIG_H264QPEL) += x86/h264_qpel_10bit.o
|
|
YASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36_sse.o
|
|
YASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o
|
|
YASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o
|
|
YASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o
|
|
YASM-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp.o
|
|
YASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp.o \
|
|
x86/rv40dsp.o
|
|
YASM-OBJS-$(CONFIG_V210_DECODER) += x86/v210.o
|
|
YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp.o
|
|
YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o
|
|
YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp.o
|
|
YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o
|
|
|
|
YASM-OBJS += x86/dsputil.o \
|
|
x86/deinterlace.o \
|
|
x86/fmtconvert.o \
|