X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Frecord.C;h=ffa2b2825e4b87b865200019be04a0bb97fc6722;hb=f9d0d999e813ae19965e07ae2f7da690b4e6fe45;hp=933e7ef04e71f1e54eaa0829421eb57ab3e7861b;hpb=94e8dc2b306135e7735b2618a54f0f7de7ac7a0c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/record.C b/cinelerra-5.0/cinelerra/record.C
index 933e7ef0..ffa2b282 100644
--- a/cinelerra-5.0/cinelerra/record.C
+++ b/cinelerra-5.0/cinelerra/record.C
@@ -39,7 +39,6 @@
 #include "errorbox.h"
 #include "file.h"
 #include "filexml.h"
-#include "filemov.h"
 #include "filesystem.h"
 #include "filethread.h"
 #include "format.inc"
@@ -48,6 +47,8 @@
 #include "keys.h"
 #include "language.h"
 #include "localsession.h"
+#include "libdv.h"
+#include "libmjpeg.h"
 #include "mainmenu.h"
 #include "mainundo.h"
 #include "mwindow.h"
@@ -56,7 +57,6 @@
 #include "picture.h"
 #include "playbackengine.h"
 #include "preferences.h"
-#include "quicktime.h"
 #include "record.h"
 #include "recordaudio.h"
 #include "recordconfig.h"
@@ -200,23 +200,25 @@ int Record::load_defaults()
 	default_asset->layers = 1;
 // Fix encoding parameters depending on driver.
 // These are locked by a specific driver.
+	const char *vcodec = 0;
 	switch( session->vconfig_in->driver ) {
 	case CAPTURE_LML:
 	case CAPTURE_BUZ:
-		strncpy(default_asset->vcodec, QUICKTIME_MJPA, 4);
+		vcodec = CODEC_TAG_MJPEG;
 		break;
 	case CAPTURE_DVB:
 	case VIDEO4LINUX2MPEG:
 		break;
 	case VIDEO4LINUX2JPEG:
-		if( strncmp(default_asset->vcodec,QUICKTIME_MJPG,4) != 0 )
-			strncpy(default_asset->vcodec,QUICKTIME_MJPA,4);
+		vcodec = CODEC_TAG_MJPEG;
 		break;
 	case CAPTURE_FIREWIRE:
 	case CAPTURE_IEC61883:
-		strncpy(default_asset->vcodec, QUICKTIME_DVSD, 4);
+		vcodec = CODEC_TAG_DVSD;
 		break;
 	}
+	if( vcodec )
+		strcpy(default_asset->vcodec, vcodec);
 
 	record_batches.load_defaults(channeldb, this);
 
@@ -1898,8 +1900,6 @@ int Record::stop_commercial_capture(int run_job)
 	return result;
 }
 
-extern void get_exe_path(char *result); // from main.C
-
 int Record::
 spawn(const char *fmt, ...)
 {