Added global version info for FFmpeg.

ggarra13 · Mar 12, 2024 · 5137f74 · 5137f74
1 parent 2338104
commit 5137f74
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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