diff --git a/baselibs.conf b/baselibs.conf index eedf933..56d8058 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -5,4 +5,5 @@ libavformat59 libavutil57 libpostproc56 libswresample4_ff5 + obsoletes "libswresample4- < -" libswscale6 diff --git a/ffmpeg-5.changes b/ffmpeg-5.changes index 8b4af5e..d87550b 100644 --- a/ffmpeg-5.changes +++ b/ffmpeg-5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 b3b0d88..1f13c64 100644 --- a/ffmpeg-5.spec +++ b/ffmpeg-5.spec @@ -462,6 +462,7 @@ 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