From 78439e2e3f1535801a049de4e422212fb5476175 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 1 Feb 2021 17:10:01 +0100 Subject: [PATCH] Fix returning nullptr where now a std::string_view is required --- mp4/mp4ids.cpp | 2 +- mpegaudio/mpegaudioframe.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mp4/mp4ids.cpp b/mp4/mp4ids.cpp index 9d4f4f3..2ea7c60 100644 --- a/mp4/mp4ids.cpp +++ b/mp4/mp4ids.cpp @@ -450,7 +450,7 @@ std::string_view channelConfigString(std::uint8_t config) case FrontCenterFrontLeftFrontRightSideLeftSideRightBackLeftBackRightLFEChannel: return "8 channels: front-center, front-left, front-right, side-left, side-right, back-left, back-right, LFE-channel"; default: - return nullptr; + return std::string_view(); } } diff --git a/mpegaudio/mpegaudioframe.cpp b/mpegaudio/mpegaudioframe.cpp index ebcea3a..d17fa31 100644 --- a/mpegaudio/mpegaudioframe.cpp +++ b/mpegaudio/mpegaudioframe.cpp @@ -26,7 +26,7 @@ std::string_view mpegChannelModeString(MpegChannelMode channelMode) case MpegChannelMode::SingleChannel: return "1 channel: single channel"; default: - return nullptr; + return std::string_view(); } }