remove whitespace at eol

[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 674e2703201b92ffa92b9a91264863fe2e9b9d73..c4b9c3c2fb0f595f1ccced42462c020a595b6427 100644 (file)
--- 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);
@@ -263,7 +265,8 @@ 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);
@@ -326,7 +329,7 @@ public:
        Condition *mux_lock;
        Condition *flow_lock;
        int done, flow;
-       
+
        void start_muxer();
        void stop_muxer();
        void flow_off();