X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.h;h=8c80f6638f7e88d7232ed1a75dfe4a2e219af7dc;hb=9db053d413fde01439cc72ec2109913dfda2ec7b;hp=9bd9e5beadbe37d6e28760ecbbb0768240432a81;hpb=a9bdd58fae360fa33d27caa059f5ca2c6fa26cd4;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.h b/cinelerra-5.1/cinelerra/fileffmpeg.h
index 9bd9e5be..8c80f663 100644
--- a/cinelerra-5.1/cinelerra/fileffmpeg.h
+++ b/cinelerra-5.1/cinelerra/fileffmpeg.h
@@ -1,10 +1,10 @@
 #ifndef __FILEFFMPEG_H__
 #define __FILEFFMPEG_H__
 
-#include "asset.inc" 
+#include "asset.inc"
 #include "bcdialog.h"
 #include "bcwindowbase.inc"
-#include "bitspopup.inc" 
+#include "bitspopup.inc"
 #include "ffmpeg.h"
 #include "filebase.h"
 #include "fileffmpeg.inc"
@@ -117,7 +117,6 @@ public:
 	~FFMPEGConfigAudio();
 
 	void create_objects();
-	void update_options();
 	int close_event();
 
 	ArrayList<BC_ListBoxItem*> presets;
@@ -166,7 +165,6 @@ public:
 	~FFMPEGConfigVideo();
 
 	void create_objects();
-	void update_options();
 	int close_event();
 
 	ArrayList<BC_ListBoxItem*> presets;
@@ -379,27 +377,27 @@ class FFOptionsDialog : public BC_DialogThread
 public:
 	FFOptionsDialog();
 	~FFOptionsDialog();
-	virtual void update_options() = 0;
+	virtual void update_options(const char *options) = 0;
 
-	void load_options();
-	void store_options();
-	void start(const char *codec_name, AVCodec *codec, char *ff_options, int ff_len);
+	void load_options(const char *bp, int len);
+	void store_options(char *cp, int len);
+	void start(const char *format_name, const char *codec_name,
+		AVCodec *codec, const char *options, int len);
 	BC_Window* new_gui();
 	void handle_done_event(int result);
 
 	FFOptionsWindow *options_window;
-	const char *codec_name;
+	const char *format_name, *codec_name;
 	AVCodec *codec;
-	char *ff_options;
-	int ff_len;
 	AVDictionary *ff_opts;
+	int ff_len;
 };
 
 class FFOptionsAudioDialog : public FFOptionsDialog
 {
 public:
 	FFMPEGConfigAudio *aud_config;
-	void update_options();
+	void update_options(const char *options);
 
 	FFOptionsAudioDialog(FFMPEGConfigAudio *aud_config);
 	~FFOptionsAudioDialog();
@@ -409,7 +407,7 @@ class FFOptionsVideoDialog : public FFOptionsDialog
 {
 public:
 	FFMPEGConfigVideo *vid_config;
-	void update_options();
+	void update_options(const char *options);
 
 	FFOptionsVideoDialog(FFMPEGConfigVideo *vid_config);
 	~FFOptionsVideoDialog();