diff options
author | wm4 <wm4@nowhere> | 2018-04-29 20:03:24 +0200 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2018-05-03 01:08:44 +0300 |
commit | e02c9b9902f5bd356088cfbff3b9c333e50f1e47 (patch) | |
tree | 511c7b99c4288cab58d313f29caba78e4f8fdce1 /player/main.c | |
parent | 0ab3184526e7b9b95c06a3ec7a6674283a5922d0 (diff) | |
download | mpv-e02c9b9902f5bd356088cfbff3b9c333e50f1e47.tar.bz2 mpv-e02c9b9902f5bd356088cfbff3b9c333e50f1e47.tar.xz |
build: make encoding mode non-optional
Makes it easier to not break the build by confusing the ifdeffery.
Diffstat (limited to 'player/main.c')
-rw-r--r-- | player/main.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/player/main.c b/player/main.c index ef54a0ac4d..f56191a297 100644 --- a/player/main.c +++ b/player/main.c @@ -164,11 +164,9 @@ void mp_destroy(struct MPContext *mpctx) uninit_audio_out(mpctx); uninit_video_out(mpctx); -#if HAVE_ENCODING // If it's still set here, it's an error. encode_lavc_free(mpctx->encode_lavc_ctx); mpctx->encode_lavc_ctx = NULL; -#endif command_uninit(mpctx); @@ -229,10 +227,8 @@ static bool handle_help_options(struct MPContext *mpctx) property_print_help(mpctx); return true; } -#if HAVE_ENCODING if (encode_lavc_showhelp(log, opts->encode_opts)) return true; -#endif return false; } @@ -414,7 +410,6 @@ int mp_initialize(struct MPContext *mpctx, char **options) cocoa_set_mpv_handle(ctx); #endif -#if HAVE_ENCODING if (opts->encode_opts->file && opts->encode_opts->file[0]) { mpctx->encode_lavc_ctx = encode_lavc_init(mpctx->global); if(!mpctx->encode_lavc_ctx) { @@ -424,7 +419,6 @@ int mp_initialize(struct MPContext *mpctx, char **options) m_config_set_profile(mpctx->mconfig, "encoding", 0); mp_input_enable_section(mpctx->input, "encode", MP_INPUT_EXCLUSIVE); } -#endif #if !HAVE_LIBASS MP_WARN(mpctx, "Compiled without libass.\n"); |