projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bclistbox selection segv + other minor fixes
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
vdevicebuz.C
diff --git
a/cinelerra-5.1/cinelerra/vdevicebuz.C
b/cinelerra-5.1/cinelerra/vdevicebuz.C
index e3c468128907133bddb72d1123b48b29011dbb17..c6b6e99f85c4bcf8890559aca48b7baa325b8e04 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vdevicebuz.C
+++ b/
cinelerra-5.1/cinelerra/vdevicebuz.C
@@
-79,8
+79,8
@@
VDeviceBUZInput::~VDeviceBUZInput()
{
done = 1;
Thread::cancel();
{
done = 1;
Thread::cancel();
- Thread::join();
}
}
+ Thread::join();
if(buffer)
{
if(buffer)
{
@@
-328,8
+328,8
@@
int VDeviceBUZ::close_all()
return 0;
}
return 0;
}
-#define COMPOSITE_TEXT
"Composite"
-#define SVIDEO_TEXT
"S-Video"
+#define COMPOSITE_TEXT
_("Composite")
+#define SVIDEO_TEXT
_("S-Video")
#define BUZ_COMPOSITE 0
#define BUZ_SVIDEO 1
#define BUZ_COMPOSITE 0
#define BUZ_SVIDEO 1