projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
font/icon scaling default=1, remove glx probe msgs
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
render.C
diff --git
a/cinelerra-5.0/cinelerra/render.C
b/cinelerra-5.0/cinelerra/render.C
index d4dabf3de9316c72d5b9ba6ae3b8b052e59864f9..53adbf90918f51f8558ac08417667f25d7e724e4 100644
(file)
--- a/
cinelerra-5.0/cinelerra/render.C
+++ b/
cinelerra-5.0/cinelerra/render.C
@@
-63,7
+63,6
@@
#include "playabletracks.h"
#include "preferences.h"
#include "preferencesthread.h"
#include "playabletracks.h"
#include "preferences.h"
#include "preferencesthread.h"
-#include "quicktime.h"
#include "renderfarm.h"
#include "render.h"
#include "statusbar.h"
#include "renderfarm.h"
#include "render.h"
#include "statusbar.h"
@@
-430,7
+429,6
@@
int Render::check_asset(EDL *edl, Asset &asset)
{
asset.audio_data = 1;
asset.channels = edl->session->audio_channels;
{
asset.audio_data = 1;
asset.channels = edl->session->audio_channels;
- if(asset.format == FILE_MOV) asset.byte_order = 0;
}
else
{
}
else
{
@@
-610,15
+608,15
@@
int Render::load_defaults(Asset *asset)
strategy = mwindow->defaults->get("RENDER_STRATEGY", SINGLE_PASS);
load_mode = mwindow->defaults->get("RENDER_LOADMODE", LOADMODE_NEW_TRACKS);
strategy = mwindow->defaults->get("RENDER_STRATEGY", SINGLE_PASS);
load_mode = mwindow->defaults->get("RENDER_LOADMODE", LOADMODE_NEW_TRACKS);
+// some defaults which work
+ asset->video_data = 1;
+ asset->audio_data = 1;
+ asset->format = FILE_FFMPEG;
+ strcpy(asset->acodec, "mp4.qt");
+ strcpy(asset->vcodec, "mp4.qt");
asset->load_defaults(mwindow->defaults,
asset->load_defaults(mwindow->defaults,
- "RENDER_",
- 1,
- 1,
- 1,
- 1,
- 1);
-
+ "RENDER_", 1, 1, 1, 1, 1);
return 0;
}
return 0;
}