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

Merge pull request #6762 from maff91:master

Browse Source
This commit is contained in:
Alexander Alekhin 2016-07-14 16:17:03 +00:00
commit f3494647c5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/videoio/src/cap_dshow.cpp
View File

@ -2447,13 +2447,15 @@ static bool setSizeAndSubtype(videoDevice * VD, int attemptWidth, int attemptHei
VD->pAmMediaType->subtype = mediatype;
//buffer size
if (mediatype == MEDIASUBTYPE_RGB24)
{
VD->pAmMediaType->lSampleSize = attemptWidth*attemptHeight*3;
if (mediatype == MEDIASUBTYPE_RGB24){
VD->pAmMediaType->lSampleSize = attemptWidth*attemptHeight * 3;
}
else
{
// For compressed data, the value can be zero.
else if ((mediatype == MEDIASUBTYPE_YUY2) || (mediatype == MEDIASUBTYPE_YVYU) ||
(mediatype == MEDIASUBTYPE_UYVY)){
VD->pAmMediaType->lSampleSize = attemptWidth*attemptHeight * 2;
}
else{
VD->pAmMediaType->lSampleSize = 0;
}