Merge branch 'develop' into bootstrap5

This commit is contained in:
emeric
2022-03-27 14:34:43 +02:00
4 changed files with 14 additions and 42 deletions
+1 -1
View File
@@ -241,7 +241,7 @@ AudioFile::visitAttachedPictures(std::function<void(const Picture&)> func) const
std::optional<AudioFileFormat>
guessMediaFileFormat(const std::filesystem::path& file)
{
AVOutputFormat* format {av_guess_format(NULL,file.string().c_str(),NULL)};
const AVOutputFormat* format {av_guess_format(NULL,file.string().c_str(),NULL)};
if (!format || !format->name)
return {};
@@ -20,6 +20,7 @@
#pragma once
#include <string_view>
#include <optional>
#include <boost/asio/ip/address.hpp>
#include <Wt/WDateTime.h>