diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 20:11:04 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 21:43:16 +0100 |
| commit | 9428e05b3f15146d47851d5e9da334dfc59a55a1 (patch) | |
| tree | 169f4b8f911e36148aeeb6f498bab21d97d69755 /player/main.c | |
| parent | 09e588662e3bbe84a8da143f0d7d7ad64d6132b0 (diff) | |
| download | mpv-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 'player/main.c')
| -rw-r--r-- | player/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); |