RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-29 02:42:21 +00:00
Code Issues Projects Releases Wiki Activity
7be09a91c2
ffmpeg/libswscale/x86
History
Michael Niedermayer add7513e64 Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 
* commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415':
  x86: h264_chromamc_10bit: drop pointless PAVG %define
  x86: mmx2 ---> mmxext in function names
  swscale: do not forget to swap data in formats with different endianness

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavfilter/x86/gradfun.c
	libswscale/input.c
	libswscale/utils.c
	libswscale/x86/swscale.c
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01 13:11:51 +01:00
..
input.asm Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 2012-10-31 13:57:09 +01:00
Makefile
output.asm Merge commit '652f5185945c8405fc57aed353286858df8d066f' 2012-10-31 14:02:35 +01:00
rgb2rgb_template.c Merge commit '652f5185945c8405fc57aed353286858df8d066f' 2012-10-31 14:02:35 +01:00
rgb2rgb.c Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 2012-11-01 13:11:51 +01:00
scale.asm Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 2012-10-31 13:57:09 +01:00
swscale_template.c Merge commit 'be923ed659016350592acb9b3346f706f8170ac5' 2012-10-31 14:16:18 +01:00
swscale.c Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 2012-11-01 13:11:51 +01:00
w64xmmtest.c
yuv2rgb_template.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
yuv2rgb.c Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415' 2012-11-01 13:11:51 +01:00