X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fasset.C;h=ec82d0e9e6ead12eb2d7e245f161a5579303b35b;hb=d60a59baa6cfe24c0fb153ed9e150a834ba29feb;hp=07aa00b3e7891c8c1eb01c3a8251e80125acd8c7;hpb=fbb844da24c44cce0509451116df248c861ef8f7;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C
index 07aa00b3..ec82d0e9 100644
--- a/cinelerra-5.1/cinelerra/asset.C
+++ b/cinelerra-5.1/cinelerra/asset.C
@@ -72,7 +72,6 @@ int Asset::init_values()
 	path[0] = 0;
 // Has to be unknown for file probing to succeed
 	format = FILE_UNKNOWN;
-	fformat[0] = 0;
 	bits = 0;
 	byte_order = 0;
 	signed_ = 0;
@@ -84,6 +83,7 @@ int Asset::init_values()
 	strcpy(vcodec, "");
 	strcpy(acodec, "");
 
+	strcpy(fformat,"mp4");
 	ff_audio_options[0] = 0;
 	ff_sample_format[0] = 0;
 	ff_audio_bitrate = 0;
@@ -99,6 +99,7 @@ int Asset::init_values()
 	interlace_mode = ILACE_MODE_UNDETECTED;
 	interlace_fixmethod = ILACE_FIXMETHOD_NONE;
 
+	mp3_bitrate = 224;
 	ampeg_bitrate = 256;
 	ampeg_derivative = 3;
 
@@ -458,9 +459,7 @@ int Asset::read(FileXML *file,
 			else
 			if(file->tag.title_is("FOLDER"))
 			{
-				const char *string = file->tag.get_property("NUMBER");
-				awindow_folder = string ? atoi(string) :
-					AWindowGUI::folder_number(file->read_text());
+				awindow_folder = file->tag.get_property("NUMBER", AW_MEDIA_FOLDER);
 			}
 			else
 			if(file->tag.title_is("VIDEO"))