Michael Niedermayer 3c7650a83d Merge remote-tracking branch 'qatar/master' ...

This early morning merge should fix --disable-yasm

* qatar/master:
  Clean up #includes in cmdutils.h.
  g729: Merge g729.h into g729dec.c.
  10l: wrap float_interleave functions in HAVE_YASM.

Conflicts:
	libavcodec/g729.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2011-05-19 13:00:31 +02:00

..

ac3dsp_mmx.c

…

ac3dsp.asm

Merge remote branch 'qatar/master'

2011-05-15 04:44:07 +02:00

cavsdsp_mmx.c

…

dct32_sse.c

…

deinterlace.asm

Merge remote branch 'qatar/master'

2011-05-15 04:44:07 +02:00

dnxhd_mmx.c

…

dsputil_mmx_avg_template.c

…

dsputil_mmx_qns_template.c

…

dsputil_mmx_rnd_template.c

…

dsputil_mmx.c

Merge remote branch 'qatar/master'

2011-05-12 04:51:24 +02:00

dsputil_mmx.h

…

dsputil_yasm.asm

Merge remote branch 'qatar/master'

2011-05-15 04:44:07 +02:00

dsputilenc_mmx.c

…

dsputilenc_yasm.asm

Merge remote-tracking branch 'qatar/master'

2011-05-18 05:42:42 +02:00

fdct_mmx.c

…

fft_3dn2.c

…

fft_3dn.c

…

fft_mmx.asm

Merge remote branch 'qatar/master'

2011-05-15 04:44:07 +02:00

fft_sse.c

…

fft.c

…

fft.h

…

fmtconvert_mmx.c

Merge remote-tracking branch 'qatar/master'

2011-05-19 13:00:31 +02:00

fmtconvert.asm

Merge remote-tracking branch 'qatar/master'

2011-05-19 06:00:31 +02:00

h264_chromamc.asm

Merge remote branch 'qatar/master'

2011-05-15 04:44:07 +02:00

h264_deblock_10bit.asm

Fix FSF address copy paste error in some license headers.

2011-05-14 21:32:31 +02:00

h264_deblock.asm

Merge remote branch 'qatar/master'

2011-05-15 04:44:07 +02:00

h264_i386.h

…

h264_idct.asm

Merge remote-tracking branch 'qatar/master'

2011-05-18 05:42:42 +02:00

h264_intrapred_init.c

…

h264_intrapred.asm

Merge remote branch 'qatar/master'

2011-05-15 04:44:07 +02:00

h264_qpel_mmx.c

…

h264_weight.asm

Merge remote branch 'qatar/master'

2011-05-15 04:44:07 +02:00

h264dsp_mmx.c

Merge remote branch 'qatar/master'

2011-05-17 04:51:33 +02:00

idct_mmx_xvid.c

…

idct_mmx.c

…

idct_sse2_xvid.c

…

idct_xvid.h

…

lpc_mmx.c

…

Makefile

Merge remote branch 'qatar/master'

2011-05-12 04:51:24 +02:00

mathops.h

…

mlpdsp.c

…

motion_est_mmx.c

…

mpegaudiodec_mmx.c

…

mpegvideo_mmx_template.c

…

mpegvideo_mmx.c

…

png_mmx.c

…

simple_idct_mmx.c

…

snowdsp_mmx.c

…

vc1dsp_mmx.c

…

vc1dsp_yasm.asm

Merge remote branch 'qatar/master'

2011-05-15 04:44:07 +02:00

vp3dsp.asm

Merge remote branch 'qatar/master'

2011-05-15 04:44:07 +02:00

vp8dsp-init.c

…

vp8dsp.asm

Merge remote-tracking branch 'qatar/master'

2011-05-18 05:42:42 +02:00

vp56_arith.h

…

vp56dsp_init.c

…

vp56dsp.asm

Merge remote branch 'qatar/master'

2011-05-15 04:44:07 +02:00

x86inc.asm

…

x86util.asm

Merge remote-tracking branch 'qatar/master'

2011-05-18 05:42:42 +02:00