Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10908 from alalek:fix_ffmpeg_uchar

Browse Source
pull/10741/merge
Vadim Pisarevsky 7 years ago
parent 53305d4a7e 2aa15ab3ff
commit 25518a12f1
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/videoio/src/cap_ffmpeg_impl.hpp

2
modules/videoio/src/cap_ffmpeg_impl.hpp
Unescape View File

@ -1707,7 +1707,7 @@ bool CvVideoWriter_FFMPEG::writeFrame( const unsigned char* data, int step, int
const int CV_STEP_ALIGNMENT = 32; const int CV_STEP_ALIGNMENT = 32;
const size_t CV_SIMD_SIZE = 32; const size_t CV_SIMD_SIZE = 32;
const size_t CV_PAGE_MASK = ~(4096 - 1); 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 || if (step % CV_STEP_ALIGNMENT != 0 ||
(((size_t)dataend - CV_SIMD_SIZE) & CV_PAGE_MASK) != (((size_t)dataend + CV_SIMD_SIZE) & CV_PAGE_MASK)) (((size_t)dataend - CV_SIMD_SIZE) & CV_PAGE_MASK) != (((size_t)dataend + CV_SIMD_SIZE) & CV_PAGE_MASK))
{ {

Write Preview
Loading…
Cancel
Save