X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.C;h=5910dd202474e59856cfbd9b22b598dff3aa2632;hp=6f4db28f0bb231ac780376bdbcd79e19c1495cf7;hb=HEAD;hpb=c6f91f271145ad9cd637f6b8f1560146178d3d41

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index 6f4db28f..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)
 {
@@ -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()