diff --git a/src/Application/GameConfig.h b/src/Application/GameConfig.h index 18dd1483424f..3e3be8521f50 100644 --- a/src/Application/GameConfig.h +++ b/src/Application/GameConfig.h @@ -84,7 +84,7 @@ class GameConfig : public Config { Bool NoMargaret = {this, "no_margareth", false, "Disable Margaret's tour messages on Emerald Island."}; ConfigEntry<::LogLevel> LogLevel = {this, "log_level", LOG_ERROR, - "Default log level. One of 'verbose', 'debug', 'info', 'warning', 'error' and 'critical'."}; + "Default log level. One of 'trace', 'debug', 'info', 'warning', 'error' and 'critical'."}; Int TraceFrameTimeMs = {this, "trace_frame_time_ms", 50, &ValidateFrameTime, "Number of milliseconds per frame when recording game traces."}; diff --git a/src/Media/FFmpegLogProxy.cpp b/src/Media/FFmpegLogProxy.cpp index 32603f38bd20..1d34569deb85 100644 --- a/src/Media/FFmpegLogProxy.cpp +++ b/src/Media/FFmpegLogProxy.cpp @@ -50,6 +50,7 @@ void FFmpegLogProxy::log(void *ptr, int level, const char *format, va_list args) } else { state.message += buffer; if (state.message.ends_with('\n')) { + state.message.pop_back(); // Drop the '\n'. _logger->log(globalFFmpegLogCategory, FFmpegLogSource::translateFFmpegLogLevel(level), "{}", state.message); state.message.clear(); }