X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.C;h=5910dd202474e59856cfbd9b22b598dff3aa2632;hb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da;hp=6cc3f58886c5a7887fe77d0229e218cc11dc19c1;hpb=066bf914215f31bbfe598f2cbce10d130f7fc519;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index 6cc3f588..5910dd20 100644
--- a/cinelerra-5.1/cinelerra/fileffmpeg.C
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.C
@@ -25,6 +25,10 @@
 #include "preferences.h"
 #include "videodevice.inc"
 
+#ifdef FFMPEG3
+#define url filename
+#endif
+
 FileFFMPEG::FileFFMPEG(Asset *asset, File *file)
  : FileBase(asset, file)
 {
@@ -836,7 +840,7 @@ int FileFFMPEG::get_index(IndexFile *index_file, MainProgressBar *progress_bar)
 	}
 
 	FileSystem fs;
-	int64_t file_bytes = fs.get_size(ff->fmt_ctx->filename);
+	int64_t file_bytes = fs.get_size(ff->fmt_ctx->url);
 	char *index_path = index_file->index_filename;
 
 	int canceled = 0;
@@ -1463,6 +1467,7 @@ FFOptionsWindow::~FFOptionsWindow()
 
 void FFOptionsWindow::create_objects()
 {
+	lock_window("FFOptionsWindow::create_objects");
 	BC_Title *title;
 	int x0 = 10, y0 = 10;
 	int x = x0, y = y0;
@@ -1508,6 +1513,7 @@ void FFOptionsWindow::create_objects()
 	options.initialize(this, FF_KIND_CODEC);
 	draw();
 	show_window(1);
+	unlock_window();
 }
 
 void FFOptionsWindow::draw()