# HG changeset patch # User Kavitha Sampath <kavi...@multicorewareinc.com> # Date 1383226415 -19800 # Thu Oct 31 19:03:35 2013 +0530 # Node ID 0a2f6547b5b6213f6bb9ebe1374f70659aef0540 # Parent 2cdef1dd17b2d66dc5a84f2e40ae3130a3f9e325 Lost in merge: (common files)check need of signed/unsigned int
diff -r 2cdef1dd17b2 -r 0a2f6547b5b6 source/common/common.cpp --- a/source/common/common.cpp Thu Oct 31 18:43:03 2013 +0530 +++ b/source/common/common.cpp Thu Oct 31 19:03:35 2013 +0530 @@ -514,7 +514,7 @@ OPT("fast-cbf") p->bEnableCbfFastMode = bvalue; OPT("rdpenalty") - CHECKSIGN(value,rdPenalty) + CHECKSIGN(value, rdPenalty) OPT("tskip") p->bEnableTransformSkip = bvalue; OPT("no-tskip-fast") diff -r 2cdef1dd17b2 -r 0a2f6547b5b6 source/encoder/motion.cpp --- a/source/encoder/motion.cpp Thu Oct 31 18:43:03 2013 +0530 +++ b/source/encoder/motion.cpp Thu Oct 31 19:03:35 2013 +0530 @@ -116,7 +116,7 @@ X265_FREE(immedVal2); } -void MotionEstimate::setSourcePU(int offset, int width, int height) +void MotionEstimate::setSourcePU(int offset, uint32_t width, uint32_t height) { /* copy PU block into cache */ primitives.blockcpy_pp(width, height, fenc, FENC_STRIDE, fencplane + offset, fencLumaStride); @@ -300,7 +300,7 @@ MV & outQMv) { ALIGN_VAR_16(int, costs[16]); - size_t stride = ref->lumaStride; + intptr_t stride = ref->lumaStride; pixel *fref = ref->fpelPlane + blockOffset; setMVP(qmvp); @@ -909,7 +909,7 @@ { ALIGN_VAR_16(int, costs[16]); pixel *fref = ref->fpelPlane + blockOffset; - size_t stride = ref->lumaStride; + intptr_t stride = ref->lumaStride; MV omv = bmv; int saved = bcost; _______________________________________________ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel