forked from pool/audacity
7d1c83f21c
Copy from home:RedDwarf:branches:multimedia:apps/audacity via accept of submit request 40703 revision 4. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/40703 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=40
18 lines
1.6 KiB
Diff
18 lines
1.6 KiB
Diff
Index: src/FFmpeg.cpp
|
|
===================================================================
|
|
--- src/FFmpeg.cpp.orig
|
|
+++ src/FFmpeg.cpp
|
|
@@ -895,9 +895,9 @@ bool FFmpegLibs::InitLibs(wxString libpa
|
|
mAVFormatVersion = wxString::Format(wxT("%d.%d.%d"),avfver >> 16 & 0xFF, avfver >> 8 & 0xFF, avfver & 0xFF);
|
|
mAVUtilVersion = wxString::Format(wxT("%d.%d.%d"),avuver >> 16 & 0xFF, avuver >> 8 & 0xFF, avuver & 0xFF);
|
|
|
|
- wxLogMessage(wxT("AVCodec version 0x%06x - %s (built against 0x%06x - %s)"),avcver,mAVCodecVersion.c_str(),LIBAVCODEC_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVCODEC_VERSION)).c_str());
|
|
- wxLogMessage(wxT("AVFormat version 0x%06x - %s (built against 0x%06x - %s)"),avfver,mAVFormatVersion.c_str(),LIBAVFORMAT_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVFORMAT_VERSION)).c_str());
|
|
- wxLogMessage(wxT("AVUtil version 0x%06x - %s (built against 0x%06x - %s)"),avuver,mAVUtilVersion.c_str(),LIBAVUTIL_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVUTIL_VERSION)).c_str());
|
|
+ wxLogMessage(wxT("AVCodec version 0x%06x - %s (built against %s)"),avcver,mAVCodecVersion.c_str(),wxString::FromUTF8(AV_STRINGIFY(LIBAVCODEC_VERSION_MAYOR)).c_str());
|
|
+ wxLogMessage(wxT("AVFormat version 0x%06x - %s (built against %s)"),avfver,mAVFormatVersion.c_str(),wxString::FromUTF8(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAYOR)).c_str());
|
|
+ wxLogMessage(wxT("AVUtil version 0x%06x - %s (built against %s)"),avuver,mAVUtilVersion.c_str(),wxString::FromUTF8(AV_STRINGIFY(LIBAVUTIL_VERSION_MAYOR)).c_str());
|
|
|
|
int avcverdiff = (avcver >> 16 & 0xFF) - int(LIBAVCODEC_VERSION_MAJOR);
|
|
int avfverdiff = (avfver >> 16 & 0xFF) - int(LIBAVFORMAT_VERSION_MAJOR);
|