cleanup of hv6 merge, add webm rendering

[goodguy/history.git] / cinelerra-5.1 / cinelerra / fileffmpeg.h

diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.h b/cinelerra-5.1/cinelerra/fileffmpeg.h
index 3d54b644256bac1d139c0784278975a58bf3deab..8c80f6638f7e88d7232ed1a75dfe4a2e219af7dc 100644 (file)
--- 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"
@@ -381,12 +381,13 @@ public:
 
        void load_options(const char *bp, int len);
        void store_options(char *cp, int len);
-       void start(const char *codec_name, AVCodec *codec, const char *options, 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;
        AVDictionary *ff_opts;
        int ff_len;