From 9428e05b3f15146d47851d5e9da334dfc59a55a1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 21 Dec 2013 20:11:04 +0100 Subject: encode_lavc: mp_msg conversions Miss two mp_msg calls, because these conflict with future commits. --- common/encode.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'common/encode.h') diff --git a/common/encode.h b/common/encode.h index fec14045ed..a4c7d821d9 100644 --- a/common/encode.h +++ b/common/encode.h @@ -3,16 +3,18 @@ #include -struct MPOpts; +struct mpv_global; +struct mp_log; struct encode_lavc_context; struct encode_output_conf; // interface for mplayer.c -struct encode_lavc_context *encode_lavc_init(struct encode_output_conf *options); +struct encode_lavc_context *encode_lavc_init(struct encode_output_conf *options, + struct mpv_global *global); void encode_lavc_finish(struct encode_lavc_context *ctx); void encode_lavc_free(struct encode_lavc_context *ctx); void encode_lavc_discontinuity(struct encode_lavc_context *ctx); -bool encode_lavc_showhelp(struct MPOpts *opts); +bool encode_lavc_showhelp(struct mp_log *log, struct encode_output_conf *options); int encode_lavc_getstatus(struct encode_lavc_context *ctx, char *buf, int bufsize, float relative_position); void encode_lavc_expect_stream(struct encode_lavc_context *ctx, int mt); void encode_lavc_set_video_fps(struct encode_lavc_context *ctx, float fps); -- cgit v1.2.3