merge: leaks, nested seq segv, ffmpeg avi frames

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

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index d9ca7836bbe0a2eb1776a3fbc4dda042805b2c3b..4860c0021dd1c9a9d868d5a435e4e1e9b263620f 100644 (file)
--- a/cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/cinelerra-5.1/cinelerra/ffmpeg.h
@@ -263,6 +263,9 @@ public:
        static void get_option_path(char *path, const char *type, const char *spec);
        static int get_format(char *format, const char *path, char *spec);
        static int scan_option_line(char *cp,char *tag,char *val);
+       static int load_defaults(const char *path, const char *type,
+                char *codec, char *codec_options, int len);
+       static void set_asset_format(Asset *asset, const char *text);
        int get_file_format();
        int get_encoder(const char *options,
                char *format, char *codec, char *bsfilter, char *bsargs);