X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.C;h=7edc387d6b5350e5eb6870b491a07ac86ddd09f4;hb=5621db270ccbeabc106e0f438941dba6f930652b;hp=10f685c12769f3b4edcbbe675ab6ac700d20fa24;hpb=fbb844da24c44cce0509451116df248c861ef8f7;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C
index 10f685c1..7edc387d 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)
 {
@@ -627,6 +631,8 @@ FFMPEGConfigVideo::FFMPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset,
 	this->asset = asset;
 	this->edl = edl;
 	preset_popup = 0;
+	ff_options_dialog = 0;
+	pixel_format = 0;
 
 	bitrate = 0;
 	quality = 0;
@@ -635,9 +641,10 @@ FFMPEGConfigVideo::FFMPEGConfigVideo(BC_WindowBase *parent_window, Asset *asset,
 
 FFMPEGConfigVideo::~FFMPEGConfigVideo()
 {
-	delete ff_options_dialog;
 	lock_window("FFMPEGConfigVideo::~FFMPEGConfigVideo");
-	if(preset_popup) delete preset_popup;
+	delete ff_options_dialog;
+	delete pixel_format;
+	delete preset_popup;
 	presets.remove_all_objects();
 	unlock_window();
 }
@@ -833,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;