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_image_proxy.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_image_proxy.cc')
| -rw-r--r-- | src/lib/ffmpeg_image_proxy.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc index 0ee41deab..c9fcd0413 100644 --- a/src/lib/ffmpeg_image_proxy.cc +++ b/src/lib/ffmpeg_image_proxy.cc @@ -28,7 +28,6 @@ #include "image.h" #include "memory_util.h" #include "video_filter_graph.h" -#include <dcp/raw_convert.h> #include <dcp/warnings.h> LIBDCP_DISABLE_WARNINGS extern "C" { @@ -38,6 +37,7 @@ extern "C" { } #include <libxml++/libxml++.h> LIBDCP_ENABLE_WARNINGS +#include <fmt/format.h> #include <iostream> #include "i18n.h" @@ -52,7 +52,6 @@ using std::shared_ptr; using std::string; using boost::optional; using std::dynamic_pointer_cast; -using dcp::raw_convert; FFmpegImageProxy::FFmpegImageProxy (boost::filesystem::path path) @@ -143,8 +142,8 @@ FFmpegImageProxy::image (Image::Alignment alignment, optional<dcp::Size>) const /* These durations are in microseconds, and represent how far into the content file we will look for streams. */ - av_dict_set (&options, "analyzeduration", raw_convert<string>(5 * 60 * 1000000).c_str(), 0); - av_dict_set (&options, "probesize", raw_convert<string>(5 * 60 * 1000000).c_str(), 0); + av_dict_set(&options, "analyzeduration", fmt::to_string(5 * 60 * 1000000).c_str(), 0); + av_dict_set(&options, "probesize", fmt::to_string(5 * 60 * 1000000).c_str(), 0); int e = avformat_open_input (&format_context, 0, 0, &options); if ((e < 0 && e == AVERROR_INVALIDDATA) || (e >= 0 && format_context->probe_score <= 25)) { |