mirror of
git://slackware.nl/current.git
synced 2025-01-14 08:01:11 +01:00
3e4363cb32
ap/moc-2.6_alpha3-x86_64-4.txz: Rebuilt. The ffmpeg7 patch isn't 100% there, so rebuild without the ffmpeg plugin. ap/sqlite-3.46.1-x86_64-1.txz: Upgraded. kde/digikam-8.4.0-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. kde/ffmpegthumbs-23.08.5-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. kde/k3b-23.08.5-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. kde/kfilemetadata-5.116.0-x86_64-6.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. kde/kpipewire-5.27.11-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/alsa-plugins-1.2.12-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/ffmpeg-7.0.2-x86_64-1.txz: Upgraded. Shared library .so-version bump. Compiled against vulkan-sdk-1.3.290.0. l/freetype-2.13.3-x86_64-1.txz: Upgraded. l/gegl-0.4.48-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/gst-plugins-bad-free-1.24.6-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. l/gst-plugins-libav-1.24.6-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/gtk4-4.14.4-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. l/libplacebo-7.349.0-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. l/mlt-7.24.0-x86_64-3.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/opencv-4.10.0-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/pipewire-1.2.2-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. Recompiled against vulkan-sdk-1.3.290.0. l/qt5-5.15.14_20240716_ae0c8451-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/qt6-6.7.2_20240610_3f005f1e-x86_64-5.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/spirv-llvm-translator-18.1.3-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. x/fcitx5-gtk-5.1.3-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. x/ibus-1.5.30-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. x/mesa-24.1.5-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. x/vulkan-sdk-1.3.290.0-x86_64-1.txz: Upgraded. xap/MPlayer-20240812-x86_64-1.txz: Upgraded. Recompiled against ffmpeg-7.0.2. xap/audacious-plugins-4.4-x86_64-3.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/ffmpegthumbnailer-2.2.2-x86_64-6.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/freerdp-2.11.7-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/mpv-0.38.0-x86_64-5.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. Recompiled against vulkan-sdk-1.3.290.0. xap/ssr-0.4.4-x86_64-3.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/xine-lib-1.2.13-x86_64-8.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/xscreensaver-6.09-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2.
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
Description: Fixes for ffmpeg 7.0
|
|
The FF_API_OLD_CHANNEL_LAYOUT api was removed in ffmpeg-7.0 so
|
|
src/AV/Output/AudioEncoder.cpp and src/AV/Output/Synchronizer.cpp fail to
|
|
compile. Fix this while remaining compatible with older ffmpeg versions.
|
|
Forwarded: https://github.com/MaartenBaert/ssr/pull/1031
|
|
Origin: https://github.com/MaartenBaert/ssr/pull/1031
|
|
Last-Updated: 2024-05-08
|
|
---
|
|
Index: simplescreenrecorder-salsa/src/AV/Output/AudioEncoder.cpp
|
|
===================================================================
|
|
--- simplescreenrecorder-salsa.orig/src/AV/Output/AudioEncoder.cpp 2024-05-08 08:58:55.973284904 +0200
|
|
+++ simplescreenrecorder-salsa/src/AV/Output/AudioEncoder.cpp 2024-05-08 08:58:55.969284862 +0200
|
|
@@ -69,7 +69,11 @@
|
|
}
|
|
|
|
unsigned int AudioEncoder::GetChannels() {
|
|
+#if LIBAVCODEC_VERSION_MAJOR < 61
|
|
return GetCodecContext()->channels;
|
|
+#else
|
|
+ return GetCodecContext()->ch_layout.nb_channels;
|
|
+#endif
|
|
}
|
|
|
|
unsigned int AudioEncoder::GetSampleRate() {
|
|
@@ -106,8 +110,13 @@
|
|
}
|
|
|
|
codec_context->bit_rate = bit_rate;
|
|
+#if LIBAVCODEC_VERSION_MAJOR < 61
|
|
codec_context->channels = channels;
|
|
codec_context->channel_layout = (channels == 1)? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO;
|
|
+#else
|
|
+ codec_context->ch_layout.nb_channels = channels;
|
|
+ codec_context->ch_layout.u.mask = (channels == 1)? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO;
|
|
+#endif
|
|
codec_context->sample_rate = sample_rate;
|
|
codec_context->time_base.num = 1;
|
|
codec_context->time_base.den = sample_rate;
|
|
Index: simplescreenrecorder-salsa/src/AV/Output/Synchronizer.cpp
|
|
===================================================================
|
|
--- simplescreenrecorder-salsa.orig/src/AV/Output/Synchronizer.cpp 2024-05-08 08:58:55.973284904 +0200
|
|
+++ simplescreenrecorder-salsa/src/AV/Output/Synchronizer.cpp 2024-05-08 08:58:55.969284862 +0200
|
|
@@ -180,7 +180,11 @@
|
|
frame->GetFrame()->nb_samples = samples;
|
|
#endif
|
|
#if SSR_USE_AVFRAME_CHANNELS
|
|
+#if LIBAVCODEC_VERSION_MAJOR < 61
|
|
frame->GetFrame()->channels = channels;
|
|
+#else
|
|
+ frame->GetFrame()->ch_layout.nb_channels = channels;
|
|
+#endif
|
|
#endif
|
|
#if SSR_USE_AVFRAME_SAMPLE_RATE
|
|
frame->GetFrame()->sample_rate = sample_rate;
|