projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bsd compatibility mods
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
bcbitmap.h
diff --git
a/cinelerra-5.1/guicast/bcbitmap.h
b/cinelerra-5.1/guicast/bcbitmap.h
index 2d3c201a85faa2932e2041fd55512d2ca8e1af25..221248b9107046a65fe73adef1f857c7ad97c9d4 100644
(file)
--- 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 "bcwindowbase.inc"
#include "bcbitmap.inc"
#include "bccmodels.h"
-#include "colors.h"
+#include "
bc
colors.h"
#include "condition.h"
#include "linklist.h"
#include "mutex.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 ||
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; }
get_color_model() == BC_YUV422) ? 1 : 0;
}
int get_w() { return w; }