FFmpeg/libavcodec/x86
Michael Niedermayer 3174616f59 Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'
* commit '6860b4081d046558c44b1b42f22022ea341a2a73':
  x86: include x86inc.asm in x86util.asm
  cng: Reindent some incorrectly indented lines
  cngdec: Allow flushing the decoder
  cngdec: Make the dbov variable have the right unit
  cngdec: Fix the memset size to cover the full array
  cngdec: Update the LPC coefficients after averaging the reflection coefficients
  configure: fix print_config() with broke awks

Conflicts:
	libavcodec/x86/ac3dsp.asm
	libavcodec/x86/dct32.asm
	libavcodec/x86/deinterlace.asm
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputilenc.asm
	libavcodec/x86/fft.asm
	libavcodec/x86/fmtconvert.asm
	libavcodec/x86/h264_chromamc.asm
	libavcodec/x86/h264_deblock.asm
	libavcodec/x86/h264_deblock_10bit.asm
	libavcodec/x86/h264_idct.asm
	libavcodec/x86/h264_idct_10bit.asm
	libavcodec/x86/h264_intrapred.asm
	libavcodec/x86/h264_intrapred_10bit.asm
	libavcodec/x86/h264_weight.asm
	libavcodec/x86/vc1dsp.asm
	libavcodec/x86/vp3dsp.asm
	libavcodec/x86/vp56dsp.asm
	libavcodec/x86/vp8dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31 13:43:33 +01:00
..
ac3dsp_init.c
ac3dsp.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
cabac.h
cavsdsp.c
dct32.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
deinterlace.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
dnxhdenc.c
dsputil_avg_template.c
dsputil_mmx.c
dsputil_mmx.h
dsputil_qns_template.c
dsputil_rnd_template.c
dsputil.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
dsputilenc_mmx.c
dsputilenc.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
dwt_yasm.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
dwt.c
dwt.h
fdct.c
fft_init.c
fft.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
fft.h
fmtconvert_init.c
fmtconvert.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
h264_chromamc_10bit.asm x86: include x86inc.asm in x86util.asm 2012-10-31 00:37:42 +01:00
h264_chromamc.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
h264_deblock_10bit.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
h264_deblock.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
h264_i386.h
h264_idct_10bit.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
h264_idct.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
h264_intrapred_10bit.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
h264_intrapred_init.c
h264_intrapred.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
h264_qpel_10bit.asm x86: include x86inc.asm in x86util.asm 2012-10-31 00:37:42 +01:00
h264_qpel.c
h264_weight_10bit.asm x86: include x86inc.asm in x86util.asm 2012-10-31 00:37:42 +01:00
h264_weight.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
h264dsp_init.c
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
imdct36.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
lpc.c
Makefile
mathops.h
mlpdsp.c
motion_est.c
mpegaudiodec.c
mpegvideo.c
mpegvideoenc_template.c
mpegvideoenc.c
pngdsp_init.c
pngdsp.asm x86: include x86inc.asm in x86util.asm 2012-10-31 00:37:42 +01:00
proresdsp_init.c
proresdsp.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
rv34dsp_init.c
rv34dsp.asm x86: include x86inc.asm in x86util.asm 2012-10-31 00:37:42 +01:00
rv40dsp_init.c
rv40dsp.asm x86: include x86inc.asm in x86util.asm 2012-10-31 00:37:42 +01:00
sbrdsp_init.c
sbrdsp.asm x86: include x86inc.asm in x86util.asm 2012-10-31 00:37:42 +01:00
simple_idct.c
snowdsp.c
v210-init.c
v210.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
vc1dsp_init.c
vc1dsp_mmx.c
vc1dsp.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
vc1dsp.h
vp3dsp_init.c
vp3dsp.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
vp8dsp_init.c
vp8dsp.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
w64xmmtest.c