diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-07-26 02:27:12 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-07-26 21:30:53 +0200 |
| commit | 35409488fd54aacefa6858dce4b02a576170e76e (patch) | |
| tree | 253e208eb0fdfbb5d7d9fa56d8e51f3fcab1b858 /src/lib/ffmpeg_image_proxy.cc | |
| parent | bc2dcbef02911c35a5ce3680c12641966d93bd49 (diff) | |
Ignore FFmpeg warnings in a nicer way.
Diffstat (limited to 'src/lib/ffmpeg_image_proxy.cc')
| -rw-r--r-- | src/lib/ffmpeg_image_proxy.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc index b54e29d44..f2b72059b 100644 --- a/src/lib/ffmpeg_image_proxy.cc +++ b/src/lib/ffmpeg_image_proxy.cc @@ -86,7 +86,7 @@ avio_seek_wrapper (void* data, int64_t offset, int whence) int FFmpegImageProxy::avio_read (uint8_t* buffer, int const amount) { - int const to_do = min(int64_t(amount), _data.size() - _pos); + int const to_do = min(static_cast<int64_t>(amount), static_cast<int64_t>(_data.size()) - _pos); if (to_do == 0) { return AVERROR_EOF; } @@ -115,6 +115,7 @@ FFmpegImageProxy::avio_seek (int64_t const pos, int whence) return _pos; } +DCPOMATIC_DISABLE_WARNINGS ImageProxy::Result FFmpegImageProxy::image (optional<dcp::Size>) const @@ -199,6 +200,8 @@ FFmpegImageProxy::image (optional<dcp::Size>) const return Result (_image, 0); } +DCPOMATIC_ENABLE_WARNINGS + void FFmpegImageProxy::add_metadata (xmlpp::Node* node) const { |