projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
background renderer hang fixes
[goodguy/history.git]
/
cinelerra-5.1
/
plugins
/
yuv
/
yuv.C
diff --git
a/cinelerra-5.1/plugins/yuv/yuv.C
b/cinelerra-5.1/plugins/yuv/yuv.C
index 0e84d90b3b9ba563a8016ea36869fed93fff4694..28d9fc2a33c507f5349a3b60c5f6b5a752f0c7c8 100644
(file)
--- a/
cinelerra-5.1/plugins/yuv/yuv.C
+++ b/
cinelerra-5.1/plugins/yuv/yuv.C
@@
-257,8
+257,6
@@
void YUVEffect::read_data(KeyFrame *keyframe)
}
}
-static YUV yuv_static;
-
#define YUV_MACRO(type, temp_type, max, components, use_yuv) \
{ \
for(int i = 0; i < input->get_h(); i++) \
#define YUV_MACRO(type, temp_type, max, components, use_yuv) \
{ \
for(int i = 0; i < input->get_h(); i++) \
@@
-283,16
+281,16
@@
static YUV yuv_static;
temp_type y, u, v, r, g, b; \
if(sizeof(type) == 4) \
{ \
temp_type y, u, v, r, g, b; \
if(sizeof(type) == 4) \
{ \
-
yuv_static
.rgb_to_yuv_f(in_row[0], in_row[1], in_row[2], y, u, v); \
+
YUV::yuv
.rgb_to_yuv_f(in_row[0], in_row[1], in_row[2], y, u, v); \
} \
else \
if(sizeof(type) == 2) \
{ \
} \
else \
if(sizeof(type) == 2) \
{ \
-
yuv_static
.rgb_to_yuv_16(in_row[0], in_row[1], in_row[2], y, u, v); \
+
YUV::yuv
.rgb_to_yuv_16(in_row[0], in_row[1], in_row[2], y, u, v); \
} \
else \
{ \
} \
else \
{ \
-
yuv_static
.rgb_to_yuv_8(in_row[0], in_row[1], in_row[2], y, u, v); \
+
YUV::yuv
.rgb_to_yuv_8(in_row[0], in_row[1], in_row[2], y, u, v); \
} \
\
if(sizeof(type) < 4) \
} \
\
if(sizeof(type) < 4) \
@@
-313,12
+311,12
@@
static YUV yuv_static;
} \
\
if(sizeof(type) == 4) \
} \
\
if(sizeof(type) == 4) \
-
yuv_static
.yuv_to_rgb_f(r, g, b, y, u, v); \
+
YUV::yuv
.yuv_to_rgb_f(r, g, b, y, u, v); \
else \
if(sizeof(type) == 2) \
else \
if(sizeof(type) == 2) \
-
yuv_static
.yuv_to_rgb_16(r, g, b, y, u, v); \
+
YUV::yuv
.yuv_to_rgb_16(r, g, b, y, u, v); \
else \
else \
-
yuv_static
.yuv_to_rgb_8(r, g, b, y, u, v); \
+
YUV::yuv
.yuv_to_rgb_8(r, g, b, y, u, v); \
\
out_row[0] = r; \
out_row[1] = g; \
\
out_row[0] = r; \
out_row[1] = g; \