ffmpeg/libavcodec/x86
Michael Niedermayer 3a0e21f037 Merge commit '186599ffe0a94d587434e5e46e190e038357ed99'
* commit '186599ffe0a94d587434e5e46e190e038357ed99':
  build: cosmetics: Place unconditional before conditional OBJS lines

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-30 10:49:43 +02:00
..
Makefile Merge commit '186599ffe0a94d587434e5e46e190e038357ed99' 2013-05-30 10:49:43 +02:00
ac3dsp.asm
ac3dsp_init.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
cabac.h
cavsdsp.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
constants.c
constants.h
dct32.asm
deinterlace.asm
dirac_dwt.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
dirac_dwt.h
diracdsp_mmx.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhdenc.c
dsputil.asm
dsputil_init.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
dsputil_mmx.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
dsputil_qns_template.c
dsputil_x86.h Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
dsputilenc.asm
dsputilenc_mmx.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
dwt_yasm.asm
fdct.c
fft.asm
fft.h
fft_init.c
fmtconvert.asm fmtconvert: int32_t input to int32_to_float_fmul_scalar 2013-05-18 18:01:16 +02:00
fmtconvert_init.c fmtconvert: int32_t input to int32_to_float_fmul_scalar 2013-05-18 18:01:16 +02:00
fpel.asm
fpel_mmx.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
h263_loopfilter.asm
h264_chromamc.asm
h264_chromamc_10bit.asm
h264_deblock.asm
h264_deblock_10bit.asm
h264_i386.h
h264_idct.asm
h264_idct_10bit.asm
h264_intrapred.asm
h264_intrapred_10bit.asm
h264_intrapred_init.c
h264_qpel.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
h264_qpel_8bit.asm
h264_qpel_10bit.asm
h264_weight.asm
h264_weight_10bit.asm
h264chroma_init.c
h264dsp_init.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
hpeldsp.asm
hpeldsp_init.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
hpeldsp_mmx.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
hpeldsp_rnd_template.c Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be' 2013-05-14 10:18:46 +02:00
idct_mmx_xvid.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
idct_sse2_xvid.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
idct_xvid.h
imdct36.asm
lpc.c
mathops.h
mlpdsp.c
motion_est.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
mpeg4qpel.asm
mpegaudiodsp.c
mpegvideo.c Merge commit '9cacdabd1c8cd257a942d8289349c37d992989b7' 2013-05-16 09:19:11 +02:00
mpegvideoenc.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
mpegvideoenc_template.c
pngdsp.asm
pngdsp_init.c
proresdsp.asm
proresdsp_init.c
qpel.asm
rnd_mmx.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
rnd_template.c Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be' 2013-05-14 10:18:46 +02:00
rv34dsp.asm
rv34dsp_init.c
rv40dsp.asm
rv40dsp_init.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
sbrdsp.asm
sbrdsp_init.c
simple_idct.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
snowdsp.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
v210-init.c
v210.asm
vc1dsp.asm
vc1dsp.h
vc1dsp_init.c
vc1dsp_mmx.c Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a' 2013-05-14 12:12:20 +02:00
videodsp.asm
videodsp_init.c
vorbisdsp.asm
vorbisdsp_init.c
vp3dsp.asm
vp3dsp_init.c
vp8dsp.asm
vp8dsp_init.c
vp56_arith.h
vp56dsp.asm
vp56dsp_init.c
w64xmmtest.c