X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.h;h=d60337fb2280fae079886751a8e423c4ea9380b6;hb=3406c79cd1a832418ad3a8b3de7a823b79ff5675;hp=d9ca7836bbe0a2eb1776a3fbc4dda042805b2c3b;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index d9ca7836..d60337fb 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/cinelerra-5.1/cinelerra/ffmpeg.h
@@ -40,12 +40,14 @@ extern "C" {
 class FFPacket  {
 	AVPacket pkt;
 public:
-	FFPacket();
-	~FFPacket();
-	void init();
 	operator AVPacket*() { return &pkt; }
 	operator AVPacket&() { return pkt; }
 	AVPacket *operator ->() { return &pkt; }
+
+	void init();
+	void finit();
+	FFPacket() { init(); }
+	~FFPacket() { finit(); }
 };
 
 class FFrame : public ListItem<FFrame> {
@@ -261,8 +263,12 @@ public:
 
 	static void set_option_path(char *path, const char *fmt, ...);
 	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 get_format(char *format, const char *path, const char *spec);
+	static int get_codec(char *codec, const char *path, const 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);