From 5137f74db7baae12d4de7993dd42569cfdb95e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Mon, 11 Mar 2024 22:15:47 -0300 Subject: [PATCH] Added global version info for FFmpeg. --- mrv2/docs/HISTORY.md | 1 + mrv2/lib/mrvGL/mrvTimelineViewportEvents.cpp | 1 + mrv2/lib/mrvWidgets/mrvVersion.cpp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md index 179782a63..bff75a83e 100644 --- a/mrv2/docs/HISTORY.md +++ b/mrv2/docs/HISTORY.md @@ -55,6 +55,7 @@ v1.0.9 draw tool, but continue its trace. - Entering a Text annotation on the viewport can be confirmed by doing SHIFT + Enter. +- Added FFmpeg's actual version information, not just each library. v1.0.8 diff --git a/mrv2/lib/mrvGL/mrvTimelineViewportEvents.cpp b/mrv2/lib/mrvGL/mrvTimelineViewportEvents.cpp index efbc42bfd..85d286929 100644 --- a/mrv2/lib/mrvGL/mrvTimelineViewportEvents.cpp +++ b/mrv2/lib/mrvGL/mrvTimelineViewportEvents.cpp @@ -414,6 +414,7 @@ namespace mrv shape->fontFamily = w->fontFamily; shape->fontSize = w->textsize() / p.viewZoom * pixels_unit; + // @bug: this is broken on image rotations shape->pts[0].x += offset.x; shape->pts[0].y -= offset.y; shape->pts[0].y = -shape->pts[0].y; diff --git a/mrv2/lib/mrvWidgets/mrvVersion.cpp b/mrv2/lib/mrvWidgets/mrvVersion.cpp index 1cc2384ec..c85fb5097 100644 --- a/mrv2/lib/mrvWidgets/mrvVersion.cpp +++ b/mrv2/lib/mrvWidgets/mrvVersion.cpp @@ -642,7 +642,7 @@ namespace mrv << endl; #endif #ifdef TLRENDER_FFMPEG - o << "FFmpeg" << endl + o << "FFmpeg " << av_version_info() << endl << "libavutil v" << AV_STRINGIFY(LIBAVUTIL_VERSION) << endl << "libavcodec v" << AV_STRINGIFY(LIBAVCODEC_VERSION) << endl << "libavformat v" << AV_STRINGIFY(LIBAVFORMAT_VERSION) << endl