diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-12-30 15:43:14 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-01-05 12:58:13 +0100 |
| commit | b03f2277a205ff7e7cdaa12c6e52322ea474a7af (patch) | |
| tree | d6067668105b2f0c6d0651bd1b8bd4186e0b8893 /src/lib/ffmpeg_stream.cc | |
| parent | e46ff5f1cf168fb73ea930f3e8469165e5f6644e (diff) | |
Bump libdcp for raw_convert changes.
raw_convert<string> is gone, so here we use fmt::{to_string,format} instead.
Other raw_converts now use fast_float.
Diffstat (limited to 'src/lib/ffmpeg_stream.cc')
| -rw-r--r-- | src/lib/ffmpeg_stream.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/ffmpeg_stream.cc b/src/lib/ffmpeg_stream.cc index 800c45eb6..0a53b1b3c 100644 --- a/src/lib/ffmpeg_stream.cc +++ b/src/lib/ffmpeg_stream.cc @@ -18,9 +18,9 @@ */ -#include "ffmpeg_stream.h" + #include "dcpomatic_assert.h" -#include <dcp/raw_convert.h> +#include "ffmpeg_stream.h" #include <dcp/warnings.h> LIBDCP_DISABLE_WARNINGS #include <libxml++/libxml++.h> @@ -28,9 +28,11 @@ extern "C" { #include <libavformat/avformat.h> } LIBDCP_ENABLE_WARNINGS +#include <fmt/format.h> + using std::string; -using dcp::raw_convert; + FFmpegStream::FFmpegStream (cxml::ConstNodePtr node) : name (node->string_child ("Name")) @@ -43,7 +45,7 @@ void FFmpegStream::as_xml(xmlpp::Element* root) const { cxml::add_text_child(root, "Name", name); - cxml::add_text_child(root, "Id", raw_convert<string>(_id)); + cxml::add_text_child(root, "Id", fmt::to_string(_id)); } bool |