diff options
| author | Underground78 <underground78@users.sourceforge.net> | 2015-06-01 00:15:05 +0300 |
|---|---|---|
| committer | Underground78 <underground78@users.sourceforge.net> | 2015-06-01 00:15:05 +0300 |
| commit | 846eff07c13899dd7d3bf38251886b5263d41213 (patch) | |
| tree | 9451569d7d9f03251eb2e385040af74d4a508ab2 /src/filters/transform/VSFilter/Copy.cpp | |
| parent | 6fcba1bead7608fb480ab943ab9689bc66f4e009 (diff) | |
| parent | e3f50f602e94794e29a17407e46b64b1ebb32232 (diff) | |
Merge branch 'release-1.7.9'1.7.9
Diffstat (limited to 'src/filters/transform/VSFilter/Copy.cpp')
| -rw-r--r-- | src/filters/transform/VSFilter/Copy.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/filters/transform/VSFilter/Copy.cpp b/src/filters/transform/VSFilter/Copy.cpp index 3d9293b0e..b6c65e0d8 100644 --- a/src/filters/transform/VSFilter/Copy.cpp +++ b/src/filters/transform/VSFilter/Copy.cpp @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2014 see Authors.txt
+ * (C) 2006-2015 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -44,7 +44,7 @@ void BltLineRGB32(DWORD* d, BYTE* sub, int w, const GUID& subtype) for (; db < dbtend; sub += 4, db++) {
if (sub[3] < 0xff) {
int y = (c2y_yb[sub[0]] + c2y_yg[sub[1]] + c2y_yr[sub[2]] + 0x108000) >> 16;
- *db = y; // w/o colors
+ *db = BYTE(y); // w/o colors
}
}
} else if (subtype == MEDIASUBTYPE_YUY2) {
@@ -54,7 +54,7 @@ void BltLineRGB32(DWORD* d, BYTE* sub, int w, const GUID& subtype) for (; ds < dstend; sub += 4, ds++) {
if (sub[3] < 0xff) {
int y = (c2y_yb[sub[0]] + c2y_yg[sub[1]] + c2y_yr[sub[2]] + 0x108000) >> 16;
- *ds = 0x8000 | y; // w/o colors
+ *ds = WORD(0x8000 | y); // w/o colors
}
}
} else if (subtype == MEDIASUBTYPE_RGB555) {
|