1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer 039e9fe01c Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
  lavfi: reclassify showfiltfmts as a TESTPROG
  graph2dot: fix printf format specifier
  swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32.
  vp8: loopfilter >=sse2 functions need aligned stack on x86-32.
  amr: remove shift out of the AMR_BIT() macro.
  dsputilenc: group yasm and inline asm function pointer assignment.
  mov: use forward declaration of a function instead of a table.
  Clarify Doxygen comment for FF_API_* #defines.
  configure: simplify get_version()
  Create version.h headers for libraries that lack them
  gitignore: Use full path instead of relative path to specify patterns
  mpegvideo: remove VLAs
  Add XTEA encryption support in libavutil
  Add Blowfish encryption support in libavutil
  eval: Add the isinf() function and tests for it
  flacdec: move lpc filter to flacdsp
  flacdec: split off channel decorrelation as flacdsp
  avplay: Add an option for not limiting the input buffer size
  FATE: add a test for WMA cover art.
  FATE: add a test for apetag cover art
  ...

Conflicts:
	.gitignore
	configure
	ffplay.c
	libavcodec/Makefile
	libavcodec/error_resilience.c
	libavcodec/mpegvideo.c
	libavcodec/ratecontrol.c
	libavdevice/avdevice.h
	libavfilter/Makefile
	libavfilter/filtfmts.c
	libavfilter/version.h
	libavformat/mov.c
	libavformat/version.h
	libavutil/Makefile
	libavutil/avutil.h
	libavutil/version.h
	libswscale/swscale.h
	libswscale/x86/swscale_mmx.c
	tests/fate/libavutil.mak
	tests/lavfi-regression.sh
	tools/graph2dot.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-04 21:03:28 +02:00
..
ac3dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-05-16 22:32:05 +02:00
ac3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-05-16 22:32:05 +02:00
cabac.h Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
cavsdsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
dct32_sse.asm
deinterlace.asm
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm diracdsp: try to fix segfault 2012-06-16 23:16:54 +02:00
dnxhd_mmx.c Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +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-06-24 02:09:53 +02:00
dsputil_mmx.h Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
dsputil_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-06-08 23:59:09 +02:00
dsputilenc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
dsputilenc_yasm.asm
dwt_yasm.asm
dwt.c libavcodec/x86/dwt.c: move some missed things under HAVE_YASM 2012-06-10 03:20:27 +02:00
dwt.h
fdct_mmx.c
fft_3dn2.c x86: use new schema for ASM macros 2012-05-29 14:49:45 +02:00
fft_3dn.c
fft_mmx.asm Merge remote-tracking branch 'qatar/master' 2012-06-28 01:08:52 +02:00
fft.c x86: use new schema for ASM macros 2012-05-29 14:49:45 +02:00
fft.h x86: use new schema for ASM macros 2012-05-29 14:49:45 +02:00
fmtconvert_mmx.c Merge remote-tracking branch 'qatar/master' 2012-06-30 22:44:18 +02:00
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2012-06-30 22:44:18 +02:00
h264_chromamc_10bit.asm
h264_chromamc.asm
h264_deblock_10bit.asm
h264_deblock.asm
h264_i386.h Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
h264_idct_10bit.asm
h264_idct.asm
h264_intrapred_10bit.asm
h264_intrapred_init.c x86: Only use optimizations with cmov if the CPU supports the instruction 2012-06-23 16:21:50 +02:00
h264_intrapred.asm
h264_qpel_10bit.asm
h264_qpel_mmx.c Fix compilation with --disable-everything. 2012-05-24 08:08:31 +02:00
h264_weight_10bit.asm
h264_weight.asm
h264dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
imdct36_sse.asm
lpc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
Makefile Revert "Revert "x86: fft: convert sse inline asm to yasm"" 2012-06-26 15:55:41 +02:00
mathops.h Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c
mpegvideo_mmx_template.c
mpegvideo_mmx.c
pngdsp-init.c
pngdsp.asm
proresdsp-init.c
proresdsp.asm
rv34dsp_init.c
rv34dsp.asm
rv40dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
rv40dsp.asm Merge remote-tracking branch 'qatar/master' 2012-05-16 22:32:05 +02:00
sbrdsp_init.c
sbrdsp.asm
simple_idct_mmx.c
snowdsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
v210-init.c
v210.asm
vc1dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-06-30 22:44:18 +02:00
vc1dsp_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-06-30 22:44:18 +02:00
vp3dsp.asm
vp8dsp-init.c Merge remote-tracking branch 'qatar/master' 2012-07-04 21:03:28 +02:00
vp8dsp.asm
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm
w64xmmtest.c