projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4 bt fixes, xft unrefd font fix, add: find in resources, add: user title, filebox...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
device1394output.C
diff --git
a/cinelerra-5.1/cinelerra/device1394output.C
b/cinelerra-5.1/cinelerra/device1394output.C
index f021a165b35585241c3a42cfd6b3768c2c4da611..7cda574b1119f0d6661bd3ffd274f1c4826bc20a 100644
(file)
--- a/
cinelerra-5.1/cinelerra/device1394output.C
+++ b/
cinelerra-5.1/cinelerra/device1394output.C
@@
-79,8
+79,8
@@
Device1394Output::~Device1394Output()
done = 1;
start_lock->unlock();
Thread::cancel();
done = 1;
start_lock->unlock();
Thread::cancel();
- Thread::join();
}
}
+ Thread::join();
if(buffer)
{
if(buffer)
{
@@
-644,13
+644,7
@@
void Device1394Output::write_frame(VFrame *input)
int h = input->get_h();
// Default to NTSC if unknown
if(h != 480 && h != 576) h = 480;
int h = input->get_h();
// Default to NTSC if unknown
if(h != 480 && h != 576) h = 480;
-
- temp_frame2 = new VFrame(0,
- -1,
- 720,
- h,
- BC_YUV422,
- -1);
+ temp_frame2 = new VFrame(720, h, BC_YUV422, 0);
}
}