generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,554 Commits 55 Branches 16 Tags 63 MiB
32a5c52856
Commit Graph

2 Commits

Author SHA1 Message Date
Johann
32a5c52856 Merge branch 'master' into experimental 
Conflicts:
	vp9/common/vp9_findnearmv.c
	vp9/common/vp9_rtcd_defs.sh
	vp9/decoder/vp9_decodframe.c
	vp9/decoder/x86/vp9_dequantize_sse2.c
	vp9/encoder/vp9_rdopt.c
	vp9/vp9_common.mk

Resolve file name changes in favor of master. Resolve rdopt changes in
favor of experimental, preserving the newer experiments.

Change-Id: If51ed8f457470281c7b20a5c1a2f4ce2cf76c20f
 2013-04-26 12:57:10 -07:00
Johann
863601c589 Normalize more intrinsic filenames 
vp9_dequantize_x86 has only sse2 functions.

vp9_dct_sse2_intrinsics has no namespace collision and can drop
_intrinsics.

vp9_idct_mmx.h is unused.

Change-Id: Ic16e31fb372a1d1e841a62ecb4189fe8f95808ec
 2013-04-25 23:26:20 -07:00