From b3f182d91db14ff3cbb284c1f365e6878648276d Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Tue, 5 Oct 2021 20:19:06 -0400 Subject: [PATCH] Added ffmpeg library version to list of open source dependencies on the Qt About Fceux window. --- src/drivers/Qt/AboutWindow.cpp | 35 ++++++++++++++++++++++++++++++++++ src/drivers/Qt/AviRecord.cpp | 1 - 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/drivers/Qt/AboutWindow.cpp b/src/drivers/Qt/AboutWindow.cpp index 48b40406..847b424c 100644 --- a/src/drivers/Qt/AboutWindow.cpp +++ b/src/drivers/Qt/AboutWindow.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #ifdef _S9XLUA_H #include @@ -32,6 +33,20 @@ #include "x264.h" #endif +#ifdef _USE_LIBAV +#ifdef __cplusplus +extern "C" +{ +#include "libavutil/version.h" +#include "libavformat/version.h" +#include "libavcodec/version.h" +#include "libswscale/version.h" +#include "libswresample/version.h" +} +#endif +#endif + + #include #include #include @@ -181,11 +196,31 @@ AboutWindow::AboutWindow(QWidget *parent) sprintf( stmp, " Linked with SDL version %d.%d.%d\n", v.major, v.minor, v.patch); credits->insertPlainText( stmp ); +#ifdef ZLIB_VERSION + sprintf( stmp, " Compiled with zlib %s\n", ZLIB_VERSION ); + credits->insertPlainText( stmp ); +#endif + #ifdef _S9XLUA_H sprintf( stmp, " Compiled with %s\n", LUA_RELEASE ); credits->insertPlainText( stmp ); #endif +#ifdef _USE_LIBAV + sprintf( stmp, " Compiled with ffmpeg libraries:\n"); + credits->insertPlainText( stmp ); + sprintf( stmp, " libavutil %i.%i.%i\n", LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, LIBAVUTIL_VERSION_MICRO); + credits->insertPlainText( stmp ); + sprintf( stmp, " libavformat %i.%i.%i\n", LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO); + credits->insertPlainText( stmp ); + sprintf( stmp, " libavcodec %i.%i.%i\n", LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO); + credits->insertPlainText( stmp ); + sprintf( stmp, " libswscale %i.%i.%i\n", LIBSWSCALE_VERSION_MAJOR, LIBSWSCALE_VERSION_MINOR, LIBSWSCALE_VERSION_MICRO); + credits->insertPlainText( stmp ); + sprintf( stmp, " libswresample %i.%i.%i\n", LIBSWRESAMPLE_VERSION_MAJOR, LIBSWRESAMPLE_VERSION_MINOR, LIBSWRESAMPLE_VERSION_MICRO); + credits->insertPlainText( stmp ); +#endif + #ifdef _USE_X264 sprintf( stmp, " Compiled with x264 version %s\n", X264_POINTVER ); credits->insertPlainText( stmp ); diff --git a/src/drivers/Qt/AviRecord.cpp b/src/drivers/Qt/AviRecord.cpp index c3659570..798eace1 100644 --- a/src/drivers/Qt/AviRecord.cpp +++ b/src/drivers/Qt/AviRecord.cpp @@ -59,7 +59,6 @@ extern "C" #include "libavutil/pixdesc.h" #include "libavformat/avformat.h" #include "libavcodec/avcodec.h" -//#include "libavresample/avresample.h" #include "libswscale/swscale.h" #include "libswresample/swresample.h" }