1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer c617bed34f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  MSS1 and MSS2: set final pixel format after common stuff has been initialised
  MSS2 decoder
  configure: handle --disable-asm before check_deps
  x86: Split inline and external assembly #ifdefs
  configure: x86: Separate inline from standalone assembler capabilities
  pktdumper: Use a custom define instead of PATH_MAX for buffers
  pktdumper: Use av_strlcpy instead of strncpy
  pktdumper: Use sizeof(variable) instead of the direct buffer length

Conflicts:
	Changelog
	configure
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/dct-test.c
	libavcodec/imgconvert.c
	libavcodec/mss12.c
	libavcodec/version.h
	libavfilter/x86/gradfun.c
	libswscale/x86/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-31 13:34:32 +02:00
..
ac3dsp_init.c
ac3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
cabac.h
cavsdsp.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
dct32.asm Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +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 remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
dsputil_mmx.h
dsputil.asm Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
dsputilenc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
dsputilenc.asm
dwt_yasm.asm
dwt.c
dwt.h
fdct.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
fft_init.c
fft.asm Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
fft.h
fmtconvert_init.c Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
fmtconvert.asm
h264_chromamc_10bit.asm x86: Split inline and external assembly #ifdefs 2012-08-31 01:53:25 +02:00
h264_chromamc.asm
h264_deblock_10bit.asm
h264_deblock.asm
h264_i386.h
h264_idct_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
h264_idct.asm
h264_intrapred_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
h264_intrapred_init.c
h264_intrapred.asm
h264_qpel_10bit.asm
h264_qpel.c Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
h264_weight_10bit.asm
h264_weight.asm
h264dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-31 13:34:32 +02:00
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
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
motion_est.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
mpegaudiodec.c Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +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-31 13:34:32 +02:00
pngdsp_init.c
pngdsp.asm
proresdsp_init.c
proresdsp.asm
rv34dsp_init.c x86: cosmetics: Comment some #endifs for better readability 2012-08-30 18:50:33 +02:00
rv34dsp.asm
rv40dsp_init.c Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01: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 Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
vc1dsp.asm
vp3dsp_init.c
vp3dsp.asm
vp8dsp_init.c Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5' 2012-08-31 13:01:30 +02:00
vp8dsp.asm
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm
w64xmmtest.c