X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.h;h=4f1624cee5c73558233cf2ec00c8bd4169d228af;hb=5ab40dced664b758745cf1e8db73cdcf18152e12;hp=9ceef1547776ce97a505050dc291a318d3d6298a;hpb=588649236b6ae38da7c8627ff7439aeff3c78798;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index 9ceef154..4f1624ce 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/cinelerra-5.1/cinelerra/ffmpeg.h
@@ -256,6 +256,7 @@ public:
 
 	int init_frame(AVFrame *picture);
 	int load(VFrame *vframe, int64_t pos);
+	int probe(int64_t pos);
 	int video_seek(int64_t pos);
 	int encode(VFrame *vframe);
 	int drain();
@@ -368,8 +369,7 @@ public:
 	static double to_secs(int64_t time, AVRational time_base);
 	int info(char *text, int len);
 
-	VFrame *new_cache_frame(VFrame *vframe, int64_t position);
-	void put_cache_frame();
+	void put_cache_frame(VFrame *frame, int64_t position);
 	int get_use_cache();
 	void purge_cache();
 
@@ -384,6 +384,7 @@ public:
 	double get_initial_timecode(int data_type, int channel, double frame_rate);
 
 	int audio_seek(int ch, int64_t pos);
+	int video_probe(int64_t pos);
 	int video_seek(int layer, int64_t pos);
 
 	int decode(int chn, int64_t pos, double *samples, int len);
@@ -435,6 +436,7 @@ public:
 
 	int decoding, encoding;
 	int has_audio, has_video;
+	int interlace_from_codec;
 
 	FFMPEG(FileBase *file_base=0);
 	~FFMPEG();
@@ -464,6 +466,7 @@ public:
 	float ff_aspect_ratio(int stream);
 	int ff_color_range(int stream);
 	int ff_color_space(int stream);
+	int ff_interlace(int stream);
 	double ff_frame_rate(int stream);
 	const char *ff_video_codec(int stream);
 	int64_t ff_video_frames(int stream);