generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into highbitdepth

Browse Source 
Conflicts:
	configure
	test/convolve_test.cc
	test/dct16x16_test.cc
	test/dct32x32_test.cc
	test/fdct4x4_test.cc
	test/fdct8x8_test.cc
	test/partial_idct_test.cc
	third_party/libyuv/README.libvpx
	vp9/common/vp9_enums.h
	vp9/common/vp9_idct.h
	vp9/common/vp9_rtcd_defs.pl
	vp9/decoder/vp9_decodeframe.c
	vp9/encoder/vp9_bitstream.c
	vp9/encoder/vp9_encodeframe.c
	vp9/encoder/vp9_encoder.c
	vp9/encoder/vp9_encoder.h
	vp9/encoder/vp9_extend.c
	vp9/encoder/vp9_quantize.c
	vp9/encoder/vp9_rd.c
	vp9/encoder/vp9_rdopt.c
	vp9/vp9_cx_iface.c
	vp9/vp9_dx_iface.c
	vp9/vp9_iface_common.h
	vpx/vp8cx.h
	vpx_scale/generic/yv12config.c
	vpxdec.c
	vpxenc.c

Change-Id: If4104c5a7cd0a29dd0bed7c3804837ba40ba7e0c
This commit is contained in:
James Hutchinson
2014-08-18 14:33:06 +01:00
committed by Deb Mukherjee
parent 9595633751 2bfbe9a886
commit 3489c19d2b
213 changed files with 21976 additions and 6309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools_common.c
View File

@@ -255,7 +255,7 @@ int vpx_img_read(vpx_image_t *img, FILE *file) {
#endif
for (y = 0; y < h; ++y) {
if (fread(buf, 1, w, file) != w)
if (fread(buf, 1, w, file) != (size_t)w)
return 0;
buf += stride;
}