diff options
| author | Rudolf Polzer <divverent@xonotic.org> | 2013-06-20 12:15:02 +0200 |
|---|---|---|
| committer | Rudolf Polzer <divverent@xonotic.org> | 2013-06-20 12:15:02 +0200 |
| commit | 1e58ccaaf07bd360aebe99ec29e39a2b0b7e4d99 (patch) | |
| tree | 996d7430753bd94e9f59b5f8b58d6e138b11620f /core | |
| parent | 011f54c68bd2d386e45f27c860c0a878d9ff5f1b (diff) | |
| download | mpv-1e58ccaaf07bd360aebe99ec29e39a2b0b7e4d99.tar.bz2 mpv-1e58ccaaf07bd360aebe99ec29e39a2b0b7e4d99.tar.xz | |
command line: allow --o= to disable encoding (i.e. empty string file name)
Diffstat (limited to 'core')
| -rw-r--r-- | core/mplayer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/mplayer.c b/core/mplayer.c index 1a99c03644..17f1b83cb5 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -4684,12 +4684,12 @@ static int mpv_main(int argc, char *argv[]) #endif #ifdef CONFIG_ENCODING - if (opts->encode_output.file) { + if (opts->encode_output.file && *opts->encode_output.file) { mpctx->encode_lavc_ctx = encode_lavc_init(&opts->encode_output); - if(!mpctx->encode_lavc_ctx) { + if(!mpctx->encode_lavc_ctx) { mp_msg(MSGT_VO, MSGL_INFO, "Encoding initialization failed."); exit_player(mpctx, EXIT_ERROR, 1); - } + } m_config_set_option0(mpctx->mconfig, "vo", "lavc"); m_config_set_option0(mpctx->mconfig, "ao", "lavc"); m_config_set_option0(mpctx->mconfig, "fixed-vo", "yes"); |