X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcbitmap.h;h=221248b9107046a65fe73adef1f857c7ad97c9d4;hb=9058f65f71aafbeab023657be0f6b84b629b70c4;hp=2d3c201a85faa2932e2041fd55512d2ca8e1af25;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/guicast/bcbitmap.h b/cinelerra-5.1/guicast/bcbitmap.h index 2d3c201a..221248b9 100644 --- a/cinelerra-5.1/guicast/bcbitmap.h +++ b/cinelerra-5.1/guicast/bcbitmap.h @@ -32,7 +32,7 @@ #include "bcwindowbase.inc" #include "bcbitmap.inc" #include "bccmodels.h" -#include "colors.h" +#include "bccolors.h" #include "condition.h" #include "linklist.h" #include "mutex.h" @@ -245,7 +245,7 @@ public: int hardware_scaling() { return xv_portid < 0 ? 0 : (get_color_model() == BC_YUV420P || - get_color_model() == BC_YUV422P || + // get_color_model() == BC_YUV422P || not in bc_to_x get_color_model() == BC_YUV422) ? 1 : 0; } int get_w() { return w; }