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. --- player/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'player') diff --git a/player/main.c b/player/main.c index e24f165b6c..555ae11085 100644 --- a/player/main.c +++ b/player/main.c @@ -228,7 +228,7 @@ static bool handle_help_options(struct MPContext *mpctx) opt_exit = 1; } #if HAVE_ENCODING - if (encode_lavc_showhelp(mpctx->opts)) + if (encode_lavc_showhelp(log, &opts->encode_output)) opt_exit = 1; #endif return opt_exit; @@ -365,7 +365,8 @@ static int mpv_main(int argc, char *argv[]) #if HAVE_ENCODING if (opts->encode_output.file && *opts->encode_output.file) { - mpctx->encode_lavc_ctx = encode_lavc_init(&opts->encode_output); + mpctx->encode_lavc_ctx = encode_lavc_init(&opts->encode_output, + mpctx->global); if(!mpctx->encode_lavc_ctx) { MP_INFO(mpctx, "Encoding initialization failed."); exit_player(mpctx, EXIT_ERROR); -- cgit v1.2.3