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
4eca52ed19
Fix typos when converting inline asm to yasm, fixes MMX-only fate-ea-vp61.
...
Originally committed as revision 24948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-26 14:33:39 +00:00
Måns Rullgård
69dad87c48
VP6: fix vp6_filter_diag4_mmx/sse on 64-bit
...
The stride can be negative and must be sign extended before being
used in pointer arithmetic.
Originally committed as revision 24926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 15:41:11 +00:00
Ronald S. Bultje
89fa3504ed
Move vp6_filter_diag4() x86 SIMD code from inline ASM to YASM. This should
...
help in fixing the Win64 fate failures.
Originally committed as revision 24922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 13:44:16 +00:00
