X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.h;h=c4b9c3c2fb0f595f1ccced42462c020a595b6427;hb=9db053d413fde01439cc72ec2109913dfda2ec7b;hp=d60337fb2280fae079886751a8e423c4ea9380b6;hpb=2f28632d8209ef735de1698a596bc94fa9613497;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index d60337fb..c4b9c3c2 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/cinelerra-5.1/cinelerra/ffmpeg.h
@@ -95,6 +95,7 @@ public:
 	virtual int create_filter(const char *filter_spec,
 		AVCodecContext *src_ctx, AVCodecContext *sink_ctx) = 0;
 	virtual void load_markers() = 0;
+	virtual IndexMarks *get_markers() = 0;
 	int create_filter(const char *filter_spec);
 	int load_filter(AVFrame *frame);
 	int read_filter(AVFrame *frame);
@@ -132,7 +133,6 @@ public:
 	int frm_count;
 	List<FFrame> frms;
 	Mutex *frm_lock;
-	IndexMarks *index_markers;
 
 	int64_t nudge;
 	int64_t seek_pos, curr_pos;
@@ -173,6 +173,7 @@ public:
 	int create_filter(const char *filter_spec,
 		AVCodecContext *src_ctx, AVCodecContext *sink_ctx);
 	void load_markers();
+	IndexMarks *get_markers();
 
 	int encode_activate();
 	int nb_samples();
@@ -233,6 +234,7 @@ public:
 	int create_filter(const char *filter_spec,
 		AVCodecContext *src_ctx, AVCodecContext *sink_ctx);
 	void load_markers();
+	IndexMarks *get_markers();
 
 	int init_frame(AVFrame *picture);
 	int load(VFrame *vframe, int64_t pos);
@@ -327,7 +329,7 @@ public:
 	Condition *mux_lock;
 	Condition *flow_lock;
 	int done, flow;
-	
+
 	void start_muxer();
 	void stop_muxer();
 	void flow_off();