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 (file)
index 0000000..90de1b9
--- /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 1dc1f308d5739b7c41276ca7923a26bc1caa5025..7baaedb3454e8a8538eef245a7faf3146c4c8beb 100644 (file)
--- 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 d27e5ceb15fafe0a2bf9799ebb6e2b438abc94cc..93a4ae02bb575d40fa3ec4e39a0599b786c58c0a 100644 (file)
--- 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) ) {