prevent popup deactivation while button_down

[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 f664512e7d0bab7a42d2239788576798583c0d97..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 "quicktime.h"
 #include "renderfarm.h"
 #include "render.h"
 #include "statusbar.h"
@@ -267,6 +266,7 @@ Render::Render(MWindow *mwindow)
 
 Render::~Render()
 {
+       close_window();
        delete package_lock;
        delete counter_lock;
        delete completion;
@@ -429,7 +429,6 @@ int Render::check_asset(EDL *edl, Asset &asset)
        {
                asset.audio_data = 1;
                asset.channels = edl->session->audio_channels;
-               if(asset.format == FILE_MOV) asset.byte_order = 0;
        }
        else
        {
@@ -609,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);
 
+// 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, 
-               "RENDER_", 
-               1,
-               1,
-               1,
-               1,
-               1);
-
+               "RENDER_", 1, 1, 1, 1, 1);
 
        return 0;
 }