X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Fvideoscope%2Fvideoscope.C;h=577224326d6a5cd2781d7ac1e95058faab0ef9e9;hb=243336668c89096732786c6b3f3c5918aa2eff26;hp=a420acf269c10096f7da000a5a5205717ec43b05;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/videoscope/videoscope.C b/cinelerra-5.1/plugins/videoscope/videoscope.C
index a420acf2..57722432 100644
--- a/cinelerra-5.1/plugins/videoscope/videoscope.C
+++ b/cinelerra-5.1/plugins/videoscope/videoscope.C
@@ -20,13 +20,14 @@
  */
 
 #include "bcdisplayinfo.h"
+#include "bccolors.h"
 #include "clip.h"
 #include "bchash.h"
 #include "filexml.h"
 #include "guicast.h"
 #include "language.h"
 #include "loadbalance.h"
-#include "cicolors.h"
+#include "bccolors.h"
 #include "pluginvclient.h"
 #include "fonts.h"
 #include "scopewindow.h"
@@ -83,7 +84,6 @@ public:
 	VideoScopeUnit(VideoScopeEffect *plugin, VideoScopeEngine *server);
 	void process_package(LoadPackage *package);
 	VideoScopeEffect *plugin;
-	YUV yuv;
 };
 
 class VideoScopeEngine : public LoadServer
@@ -416,21 +416,13 @@ static void draw_point(unsigned char **rows,
 			{ \
 				if(sizeof(type) == 2) \
 				{ \
-					yuv.yuv_to_rgb_16(r, \
-						g, \
-						b, \
-						in_pixel[0], \
-						in_pixel[1], \
-						in_pixel[2]); \
+					YUV::yuv.yuv_to_rgb_16(r, g, b, \
+						in_pixel[0], in_pixel[1], in_pixel[2]); \
 				} \
 				else \
 				{ \
-					yuv.yuv_to_rgb_8(r, \
-						g, \
-						b, \
-						in_pixel[0], \
-						in_pixel[1], \
-						in_pixel[2]); \
+					YUV::yuv.yuv_to_rgb_8(r, g, b, \
+						in_pixel[0], in_pixel[1], in_pixel[2]); \
 				} \
 			} \
 			else \