X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fformattools.C;h=d72ed4cdb5ca3e0a1179bbd60daab9cb09abd0c1;hb=2d8ee7ae9c2f42d8c6f2d5dcc8949ef989ebd7af;hp=a8f3f6bf85da74f0e2b7d4c76568d728d980e37d;hpb=328cb789bec2048b23fc731cf4eae860dbacd2b6;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/formattools.C b/cinelerra-5.0/cinelerra/formattools.C
index a8f3f6bf..d72ed4cd 100644
--- a/cinelerra-5.0/cinelerra/formattools.C
+++ b/cinelerra-5.0/cinelerra/formattools.C
@@ -851,17 +851,16 @@ FormatFFMPEG::~FormatFFMPEG()
 }
 
 int FormatFFMPEG::load_defaults(const char *path, const char *type,
-		char *codec, char *codec_options, int len)
+		 char *codec, char *codec_options, int len)
 {
 	char default_file[BCTEXTLEN];
-	FFMPEG::set_option_path(default_file, "%s/%s", path, type);
+	FFMPEG::set_option_path(default_file, "%s/%s.dfl", path, type);
 	FILE *fp = fopen(default_file,"r");
 	if( !fp ) return 1;
-	char default_codec[BCSTRLEN];
-	fgets(default_codec, sizeof(default_codec), fp);
+	fgets(codec, BCSTRLEN, fp);
 	fclose(fp);
-	char *cp=codec, *dp=default_codec;
-	while( *dp && *dp!='\n' ) *cp++ = *dp++;
+	char *cp = codec;
+	while( *cp && *cp!='\n' ) ++cp;
 	*cp = 0;
 	FFMPEG::set_option_path(default_file, "%s/%s", path, codec);
 	return FFMPEG::load_options(default_file, codec_options, len);