From 59d54df1b8abc34d487af7939ac662472fd41bd64a275668b1c2e895af7b5ed2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 18 Mar 2023 07:52:57 +0000 Subject: [PATCH] Revert to r62: ffmpeg-6 is going to provide libswscale4 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=64 --- baselibs.conf | 1 - ffmpeg-5.changes | 5 ----- ffmpeg-5.spec | 1 - 3 files changed, 7 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 56d8058..eedf933 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -5,5 +5,4 @@ libavformat59 libavutil57 libpostproc56 libswresample4_ff5 - obsoletes "libswresample4- < -" libswscale6 diff --git a/ffmpeg-5.changes b/ffmpeg-5.changes index d87550b..8b4af5e 100644 --- a/ffmpeg-5.changes +++ b/ffmpeg-5.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Mar 16 18:11:17 UTC 2023 - Callum Farmer - -- Obsolete old FFmpeg 5 libswresample4, otherwise they'll conflict - ------------------------------------------------------------------- Thu Mar 16 17:55:37 UTC 2023 - Jan Engelhardt diff --git a/ffmpeg-5.spec b/ffmpeg-5.spec index 1f13c64..b3b0d88 100644 --- a/ffmpeg-5.spec +++ b/ffmpeg-5.spec @@ -462,7 +462,6 @@ This subpackage contains the headers for FFmpeg libpostproc. Summary: FFmpeg software resampling library Group: System/Libraries Requires: libavutil57 = %version-%release -Obsoletes: libswresample4 < %version-%release %description -n libswresample4_ff5 The libswresample library performs audio conversion between different