Michael Niedermayer bec180e112 Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93' ... * commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93': (21 commits) cmdutils: fix a memleak when specifying an option twice. x86: mpegvideo: more sensible names for optimization file and init function x86: mpegvideoenc: Split optimizations off into a separate file dnxhdenc: x86: more sensible names for optimization file and init function svq1/svq3: Move common code out of SVQ1 decoder-specific file dirac: add Comments and references to the standard lavr: x86: optimized 6-channel flt to fltp conversion lavr: x86: optimized 2-channel flt to fltp conversion lavr: x86: optimized 6-channel flt to s16p conversion lavr: x86: optimized 2-channel flt to s16p conversion lavr: x86: optimized 6-channel s16 to fltp conversion lavr: x86: optimized 2-channel s16 to fltp conversion lavr: x86: optimized 6-channel s16 to s16p conversion lavr: x86: optimized 2-channel s16 to s16p conversion lavr: x86: optimized 2-channel fltp to flt conversion lavr: x86: optimized 6-channel fltp to s16 conversion lavr: x86: optimized 2-channel fltp to s16 conversion lavr: x86: optimized 6-channel s16p to flt conversion lavr: x86: optimized 2-channel s16p to flt conversion lavr: x86: optimized 6-channel s16p to s16 conversion ... Conflicts: libavcodec/dirac.c libavcodec/mpegvideo.h libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-08-24 14:30:40 +02:00
..
ac3dsp_init.c	Merge remote-tracking branch 'qatar/master'	2012-08-15 15:55:24 +02:00
ac3dsp.asm	Merge remote-tracking branch 'qatar/master'	2012-08-04 23:51:43 +02:00
cabac.h	Merge remote-tracking branch 'qatar/master'	2012-08-14 15:34:39 +02:00
cavsdsp_mmx.c	Merge remote-tracking branch 'qatar/master'	2012-08-09 19:31:56 +02:00
dct32_sse.asm	Merge remote-tracking branch 'qatar/master'	2012-08-04 23:51:43 +02:00
deinterlace.asm	Merge remote-tracking branch 'qatar/master'	2012-08-07 23:04:55 +02:00
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 remote-tracking branch 'qatar/master'	2012-08-09 19:31:56 +02:00
dsputil_mmx.h	Merge remote-tracking branch 'qatar/master'	2012-08-09 19:31:56 +02:00
dsputil.asm	Merge remote-tracking branch 'qatar/master'	2012-08-13 14:38:43 +02:00
dsputilenc_mmx.c	Merge remote-tracking branch 'qatar/master'	2012-08-09 19:31:56 +02:00
dsputilenc.asm	Merge remote-tracking branch 'qatar/master'	2012-08-13 14:38:43 +02:00
dwt_yasm.asm
dwt.c	Merge remote-tracking branch 'qatar/master'	2012-08-09 19:31:56 +02:00
dwt.h
fdct_mmx.c	Merge remote-tracking branch 'qatar/master'	2012-08-09 19:31:56 +02:00
fft_init.c	Merge remote-tracking branch 'qatar/master'	2012-08-15 15:55:24 +02:00
fft_mmx.asm	Merge remote-tracking branch 'qatar/master'	2012-08-07 23:04:55 +02:00
fft.h	Merge remote-tracking branch 'qatar/master'	2012-08-03 23:13:06 +02:00
fmtconvert_init.c	Merge remote-tracking branch 'qatar/master'	2012-08-15 15:55:24 +02:00
fmtconvert.asm	Merge remote-tracking branch 'qatar/master'	2012-08-07 23:04:55 +02:00
h264_chromamc_10bit.asm	x86: add colons after labels	2012-08-07 15:20:56 +01:00
h264_chromamc.asm	Merge remote-tracking branch 'qatar/master'	2012-08-07 23:04:55 +02:00
h264_deblock_10bit.asm	Merge remote-tracking branch 'qatar/master'	2012-08-07 23:04:55 +02:00
h264_deblock.asm	Merge remote-tracking branch 'qatar/master'	2012-07-31 22:41:00 +02:00
h264_i386.h	Merge remote-tracking branch 'qatar/master'	2012-08-14 15:34:39 +02:00
h264_idct_10bit.asm	Merge remote-tracking branch 'qatar/master'	2012-08-07 23:04:55 +02:00
h264_idct.asm	Merge remote-tracking branch 'qatar/master'	2012-08-07 23:04:55 +02:00
h264_intrapred_10bit.asm
h264_intrapred_init.c	Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'	2012-08-07 22:45:46 +02:00
h264_intrapred.asm	Merge remote-tracking branch 'qatar/master'	2012-08-07 23:04:55 +02:00
h264_qpel_10bit.asm	x86: add colons after labels	2012-08-07 15:20:56 +01:00
h264_qpel_mmx.c	Merge remote-tracking branch 'qatar/master'	2012-07-26 21:37:15 +02:00
h264_weight_10bit.asm	x86: add colons after labels	2012-08-07 15:20:56 +01:00
h264_weight.asm	Merge remote-tracking branch 'qatar/master'	2012-08-07 23:04:55 +02:00
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	Merge remote-tracking branch 'qatar/master'	2012-08-09 19:31:56 +02:00
idct_sse2_xvid.c	idct_sse2_xvid: remove libavutil/internal.h include	2012-08-16 17:26:06 +02:00
idct_xvid.h
imdct36_sse.asm
lpc_mmx.c	lpc_mmx: remove libavutil/internal.h include	2012-08-16 17:26:41 +02:00
Makefile	Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93'	2012-08-24 14:30:40 +02:00
mathops.h	Merge remote-tracking branch 'qatar/master'	2012-08-09 19:31:56 +02:00
mlpdsp.c	x86/mlpdsp: remove libavutil/internal.h include	2012-08-16 17:28:13 +02:00
motion_est_mmx.c	x86/motion_est_mmx: remove libavutil/internal.h include	2012-08-16 17:28:37 +02:00
mpegaudiodec_mmx.c	Merge remote-tracking branch 'qatar/master'	2012-08-09 19:31:56 +02:00
mpegvideo.c	Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93'	2012-08-24 14:30:40 +02:00
mpegvideoenc_template.c	Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93'	2012-08-24 14:30:40 +02:00
mpegvideoenc.c	Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93'	2012-08-24 14:30:40 +02:00
pngdsp_init.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
pngdsp.asm	x86: pngdsp: Fix assembly for OS/2	2012-08-08 15:45:09 +02:00
proresdsp_init.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
proresdsp.asm	Merge remote-tracking branch 'qatar/master'	2012-08-03 23:13:06 +02:00
rv34dsp_init.c	x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h	2012-08-09 00:58:20 +01:00
rv34dsp.asm	x86: use 32-bit source registers with movd instruction	2012-08-07 15:21:20 +01:00
rv40dsp_init.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
rv40dsp.asm	x86: use 32-bit source registers with movd instruction	2012-08-07 15:21:20 +01:00
sbrdsp_init.c
sbrdsp.asm
simple_idct_mmx.c	simple_idct_mmx: remove libavutil/internal.h include	2012-08-16 17:28:57 +02:00
snowdsp_mmx.c	Merge remote-tracking branch 'qatar/master'	2012-08-09 19:31:56 +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	Merge remote-tracking branch 'qatar/master'	2012-08-04 23:51:43 +02:00
vp3dsp.asm	Merge remote-tracking branch 'qatar/master'	2012-07-29 02:16:26 +02:00
vp8dsp_init.c	Merge remote-tracking branch 'qatar/master'	2012-08-16 16:20:30 +02:00
vp8dsp.asm	Merge remote-tracking branch 'qatar/master'	2012-08-07 23:04:55 +02:00
vp56_arith.h
vp56dsp_init.c	Merge remote-tracking branch 'qatar/master'	2012-08-09 19:31:56 +02:00
vp56dsp.asm	Merge remote-tracking branch 'qatar/master'	2012-08-07 23:04:55 +02:00
w64xmmtest.c