Merge pull request opencv#10908 from alalek:fix_ffmpeg_uchar

vpisarev · vpisarev · commit 25518a12f1a7 · 2018-02-20T12:22:09.000Z
diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp
@@ -1707,7 +1707,7 @@ bool CvVideoWriter_FFMPEG::writeFrame( const unsigned char* data, int step, int
     const int CV_STEP_ALIGNMENT = 32;
     const size_t CV_SIMD_SIZE = 32;
     const size_t CV_PAGE_MASK = ~(4096 - 1);
-    const uchar* dataend = data + ((size_t)height * step);
+    const unsigned char* dataend = data + ((size_t)height * step);
     if (step % CV_STEP_ALIGNMENT != 0 ||
         (((size_t)dataend - CV_SIMD_SIZE) & CV_PAGE_MASK) != (((size_t)dataend + CV_SIMD_SIZE) & CV_PAGE_MASK))
     {

Original file line number	Diff line number	Diff line change
`@@ -1707,7 +1707,7 @@ bool CvVideoWriter_FFMPEG::writeFrame( const unsigned char* data, int step, int`
`1707`	`1707`	`const int CV_STEP_ALIGNMENT = 32;`
`1708`	`1708`	`const size_t CV_SIMD_SIZE = 32;`
`1709`	`1709`	`const size_t CV_PAGE_MASK = ~(4096 - 1);`
`1710`		`- const uchar* dataend = data + ((size_t)height * step);`
	`1710`	`+ const unsigned char* dataend = data + ((size_t)height * step);`
`1711`	`1711`	`if (step % CV_STEP_ALIGNMENT != 0 \|\|`
`1712`	`1712`	`(((size_t)dataend - CV_SIMD_SIZE) & CV_PAGE_MASK) != (((size_t)dataend + CV_SIMD_SIZE) & CV_PAGE_MASK))`
`1713`	`1713`	`{`