From: Good Guy <good1.2guy@gmail.com>
Date: Fri, 23 Dec 2016 14:21:25 +0000 (-0700)
Subject: repair filebox history segv, add bluray_lo
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=112b13b530e304cf8a827cd58e168ffa573b9d9b;p=goodguy%2Fhistory.git

repair filebox history segv, add bluray_lo
---

diff --git a/cinelerra-5.1/ffmpeg/video/bluray_lo.m2ts b/cinelerra-5.1/ffmpeg/video/bluray_lo.m2ts
new file mode 100644
index 00000000..90de1b93
--- /dev/null
+++ b/cinelerra-5.1/ffmpeg/video/bluray_lo.m2ts
@@ -0,0 +1,7 @@
+mpegts libx264
+id=0x1011
+profile=baseline
+level=3.0
+preset=medium
+bluray-compat=1
+x264opts keyint=25:min-keyint=4:qpmin=3:qpmax=33:qp_step=4:merange=8
diff --git a/cinelerra-5.1/guicast/bcfilebox.C b/cinelerra-5.1/guicast/bcfilebox.C
index 1dc1f308..7baaedb3 100644
--- a/cinelerra-5.1/guicast/bcfilebox.C
+++ b/cinelerra-5.1/guicast/bcfilebox.C
@@ -580,10 +580,6 @@ void BC_FileBox::create_objects()
 	int directory_title_margin = MAX(20,
 		resources->filebox_text_images[0]->get_h());
 
-// Create recent dir list
-	create_history();
-	update_history();
-
 // Directories aren't filtered in FileSystem so skip this
 	if(!want_directory)
 	{
@@ -660,6 +656,10 @@ void BC_FileBox::create_objects()
 		directory_title->update(fs->get_current_dir());
 	}
 
+// Create recent dir list
+	create_history();
+	update_history();
+
 	listbox = 0;
 	create_listbox(x, y, get_display_mode());
 	y += listbox->get_h() + 10;
diff --git a/cinelerra-5.1/libzmpeg3/libzmpeg3.C b/cinelerra-5.1/libzmpeg3/libzmpeg3.C
index d27e5ceb..93a4ae02 100644
--- a/cinelerra-5.1/libzmpeg3/libzmpeg3.C
+++ b/cinelerra-5.1/libzmpeg3/libzmpeg3.C
@@ -418,7 +418,7 @@ check_sig(char *path)
   if( !fs->open_file() ) { /* File found */
     char *ext = strrchr(path, '.');
     uint32_t bits = fs->read_uint32();
-    uint32_t bits2 = fs->read_uint32();
+//  uint32_t bits2 = fs->read_uint32();
  
     /* pre-approved suffixes */
     if( ext && !strncasecmp(ext, ".mp3", 4) ) {