projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
renderfarm.C
diff --git
a/cinelerra-5.1/cinelerra/renderfarm.C
b/cinelerra-5.1/cinelerra/renderfarm.C
index 074f0461ee1afd507e07411eb6234556e94ab7da..4231d2692ab20b176921a2fff37990ff8d6a8eb9 100644
(file)
--- a/
cinelerra-5.1/cinelerra/renderfarm.C
+++ b/
cinelerra-5.1/cinelerra/renderfarm.C
@@
-2,6
+2,7
@@
/*
* CINELERRA
* Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
/*
* CINELERRA
* Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-492,13
+493,7
@@
void RenderFarmServerThread::send_asset()
// The asset must be sent in two segments.
// One segment is stored in the EDL and contains decoding information.
// One segment is stored in the asset and contains encoding information.
// The asset must be sent in two segments.
// One segment is stored in the EDL and contains decoding information.
// One segment is stored in the asset and contains encoding information.
- server->default_asset->save_defaults(&defaults,
- 0,
- 1,
- 1,
- 1,
- 1,
- 1);
+ server->default_asset->save_defaults(&defaults, 0, 1, 1, 1, 1, 1);
defaults.save_string(string1);
FileXML file;
server->default_asset->write(&file, 0, 0);
defaults.save_string(string1);
FileXML file;
server->default_asset->write(&file, 0, 0);