X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fffmpeg.h;h=931e9c4d8902990747613a304a56dca04fbc516f;hb=f9d0d999e813ae19965e07ae2f7da690b4e6fe45;hp=040bdcda3dfd148e16e0baa049f4eb04a33e6ad7;hpb=fe44dc1d43f34e4440f4c398bbf2475a07f80ffc;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/ffmpeg.h b/cinelerra-5.0/cinelerra/ffmpeg.h
index 040bdcda..931e9c4d 100644
--- a/cinelerra-5.0/cinelerra/ffmpeg.h
+++ b/cinelerra-5.0/cinelerra/ffmpeg.h
@@ -77,9 +77,12 @@ public:
 	virtual int encode_activate();
 	virtual int decode_activate();
 	int read_packet();
+	int write_packet(FFPacket &pkt);
+	int flush();
 	int decode(AVFrame *frame);
 
 	virtual int decode_frame(AVFrame *frame, int &got_frame) = 0;
+	virtual int encode_frame(FFPacket &pkt, AVFrame *frame, int &got_frame) = 0;
 	virtual int init_frame(AVFrame *frame) = 0;
 	virtual int create_filter(const char *filter_spec,
 		AVCodecContext *src_ctx, AVCodecContext *sink_ctx) = 0;
@@ -153,6 +156,7 @@ public:
 	virtual ~FFAudioStream();
 	int load_history(uint8_t **data, int len);
 	int decode_frame(AVFrame *frame, int &got_frame);
+	int encode_frame(FFPacket &pkt, AVFrame *frame, int &got_frame);
 	int create_filter(const char *filter_spec,
 		AVCodecContext *src_ctx, AVCodecContext *sink_ctx);
 
@@ -183,6 +187,7 @@ public:
 	FFVideoStream(FFMPEG *ffmpeg, AVStream *strm, int idx);
 	virtual ~FFVideoStream();
 	int decode_frame(AVFrame *frame, int &got_frame);
+	int encode_frame(FFPacket &pkt, AVFrame *frame, int &got_frame);
 	int create_filter(const char *filter_spec,
 		AVCodecContext *src_ctx, AVCodecContext *sink_ctx);
 
@@ -235,7 +240,7 @@ public:
 	int get_encoder(FILE *fp,
 		char *format, char *codec, char *bsfilter, char *bsargs);
 	int read_options(const char *options, AVDictionary *&opts);
-	int scan_options(const char *options, AVDictionary *&opts);
+	int scan_options(const char *options, AVDictionary *&opts, AVStream *st);
 	int read_options(FILE *fp, const char *options, AVDictionary *&opts);
 	int load_options(const char *options, AVDictionary *&opts);
 	static int load_options(const char *path, char *bfr, int len);