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 |
|
Diego Biurrun
|
888fa31eca
|
Fix FSF address copy paste error in some license headers.
|
2011-05-14 21:32:31 +02:00 |
|
Mans Rullgard
|
2912e87a6c
|
Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
2011-03-19 13:33:20 +00:00 |
|
Ronald S. Bultje
|
8d147f1f60
|
For rounding in chroma MC SSSE3, use 16-byte pw_3/4 instead of reading 8 bytes
and then using movlhps to dup it into the higher half of the register.
Originally committed as revision 26086 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
2010-12-24 17:23:22 +00:00 |
|
Ronald S. Bultje
|
d0eb5a1174
|
Move H264 chroma MC from inline asm to yasm. This fixes VP3/5/6 and VC-1
fate failures on Win64.
Originally committed as revision 24989 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
2010-08-30 16:31:04 +00:00 |
|