summaryrefslogtreecommitdiffstats
path: root/common/encode.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-21 20:11:04 +0100
committerwm4 <wm4@nowhere>2013-12-21 21:43:16 +0100
commit9428e05b3f15146d47851d5e9da334dfc59a55a1 (patch)
tree169f4b8f911e36148aeeb6f498bab21d97d69755 /common/encode.h
parent09e588662e3bbe84a8da143f0d7d7ad64d6132b0 (diff)
downloadmpv-9428e05b3f15146d47851d5e9da334dfc59a55a1.tar.bz2
mpv-9428e05b3f15146d47851d5e9da334dfc59a55a1.tar.xz
encode_lavc: mp_msg conversions
Miss two mp_msg calls, because these conflict with future commits.
Diffstat (limited to 'common/encode.h')
-rw-r--r--common/encode.h8
1 files changed, 5 insertions, 3 deletions
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 <stdbool.h>
-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);