1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer 8579d4b2f0 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: export filtered -lz flag in config.mak
  build: add separate setting for host linker
  configure: probe_cc: use separate variable for linker output flag
  x86: Always compile files with functions that are called unconditionally
  x86: mpegvideoenc: fix linking with --disable-mmx
  x86: mpegvideoenc: Do not abuse HAVE_ variables for template instantiation

Conflicts:
	Makefile
	configure
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-29 18:13:00 +02:00
..
ac3dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
ac3dsp.asm
cabac.h Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
cavsdsp.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
dct32.asm Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
deinterlace.asm
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhdenc.c Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93' 2012-08-24 14:30:40 +02:00
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
dsputil_mmx.h
dsputil.asm Merge remote-tracking branch 'qatar/master' 2012-08-13 14:38:43 +02:00
dsputilenc_mmx.c
dsputilenc.asm Merge remote-tracking branch 'qatar/master' 2012-08-13 14:38:43 +02:00
dwt_yasm.asm
dwt.c
dwt.h
fdct.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
fft_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
fft.asm Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
fft.h
fmtconvert_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
fmtconvert.asm
h264_chromamc_10bit.asm
h264_chromamc.asm
h264_deblock_10bit.asm
h264_deblock.asm
h264_i386.h Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
h264_idct_10bit.asm
h264_idct.asm
h264_intrapred_10bit.asm
h264_intrapred_init.c
h264_intrapred.asm
h264_qpel_10bit.asm
h264_qpel.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
h264_weight_10bit.asm
h264_weight.asm
h264dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
idct_mmx_xvid.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
idct_mmx.c
idct_sse2_xvid.c idct_sse2_xvid: remove libavutil/internal.h include 2012-08-16 17:26:06 +02:00
idct_xvid.h
imdct36.asm Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
lpc.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-08-29 18:13:00 +02:00
mathops.h
mlpdsp.c x86/mlpdsp: remove libavutil/internal.h include 2012-08-16 17:28:13 +02:00
motion_est.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
mpegaudiodec.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
mpegvideo.c Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93' 2012-08-24 14:30:40 +02:00
mpegvideoenc_template.c Merge remote-tracking branch 'qatar/master' 2012-08-29 18:13:00 +02:00
mpegvideoenc.c Merge remote-tracking branch 'qatar/master' 2012-08-29 18:13:00 +02:00
pngdsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
pngdsp.asm
proresdsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
proresdsp.asm
rv34dsp_init.c
rv34dsp.asm
rv40dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
rv40dsp.asm
sbrdsp_init.c
sbrdsp.asm
simple_idct.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
snowdsp.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
v210-init.c
v210.asm
vc1dsp_mmx.c vc1dsp_mmx: remove libavutil/internal.h include 2012-08-16 17:29:29 +02:00
vc1dsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-13 14:38:43 +02:00
vp3dsp_init.c
vp3dsp.asm
vp8dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vp8dsp.asm
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm
w64xmmtest.c