X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Frender.C;h=53adbf90918f51f8558ac08417667f25d7e724e4;hb=c0b71a7151437c681fe832d1e446924a49ab29aa;hp=d4dabf3de9316c72d5b9ba6ae3b8b052e59864f9;hpb=91efd376233a15f6572e6f68d28a5bee69797e87;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.0/cinelerra/render.C b/cinelerra-5.0/cinelerra/render.C index d4dabf3d..53adbf90 100644 --- 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" @@ -430,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 { @@ -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); +// 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; }