1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer 5a153604c9 Merge remote branch 'qatar/master'
* qatar/master:
  Fix FSF address copy paste error in some license headers.
  Add an aac sample which uses LTP to fate-aac.
DUPLICATE  [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.
  arm: properly mark external symbol call

Conflicts:
	libavcodec/x86/ac3dsp.asm
	libavcodec/x86/deinterlace.asm
	libavcodec/x86/dsputil_yasm.asm
	libavcodec/x86/dsputilenc_yasm.asm
	libavcodec/x86/fft_mmx.asm
	libavcodec/x86/fmtconvert.asm
	libavcodec/x86/h264_chromamc.asm
	libavcodec/x86/h264_deblock.asm
	libavcodec/x86/h264_idct.asm
	libavcodec/x86/h264_intrapred.asm
	libavcodec/x86/h264_weight.asm
	libavcodec/x86/vc1dsp_yasm.asm
	libavcodec/x86/vp3dsp.asm
	libavcodec/x86/vp56dsp.asm
	libavcodec/x86/vp8dsp.asm
	libavcodec/x86/x86util.asm
	libswscale/ppc/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-15 04:44:07 +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 branch 'qatar/master' 2011-05-15 04:44:07 +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
fmtconvert.asm Merge remote branch 'qatar/master' 2011-05-15 04:44:07 +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 branch 'qatar/master' 2011-05-15 04:44:07 +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-12 04:51:24 +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 branch 'qatar/master' 2011-05-15 04:44:07 +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 branch 'qatar/master' 2011-05-15 04:44:07 +02:00