_scmsync.obsinfo

@@ -1,4 +1,3 @@
-mtime: 1724842934
+mtime: 1724938970
-commit: 9e43e5445b98d8995b81b0fc26eca3b5334fb0e654fa27f34d5f3cd90ff11654
+commit: c4931895316fa0a3175739d008d5dafa33dcdd5e31e9fc99b1a8d06997c0fe49
-url: https://src.opensuse.org/jengelh/ffmpeg-4
+url: https://src.opensuse.org/dirkmueller/ffmpeg-4.git
-revision: master

ffmpeg-4.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct  9 07:12:38 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- disable xvid support on SLFO/SLE16
+
 -------------------------------------------------------------------
 Wed Aug 28 10:42:38 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 
@@ -98,7 +103,7 @@ Wed Apr 19 21:00:41 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
   * avcodec/012v: Order operations for odd size handling
   * avcodec/alsdec: The minimal block is at least 7 bits
   * avcodec/bink:
-    - Avoid undefined out of array end pointers in 
+    - Avoid undefined out of array end pointers in
       binkb_decode_plane()
     - Fix off by 1 error in ref end
   * avcodec/eac3dec: avoid float noise in fixed mode addition to
@@ -282,7 +287,7 @@ Tue Aug 10 09:38:39 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>
 -------------------------------------------------------------------
 Sat Jul 10 10:11:32 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
 
-- Remove second hunk of ffmpeg-CVE-2020-22046.patch, that contains 
+- Remove second hunk of ffmpeg-CVE-2020-22046.patch, that contains
   a goto to a none existing label. In order to distinguish this
   patch from the original, I renamed it to
   ffmpeg-4.4-CVE-2020-22046.patch
@@ -308,7 +313,7 @@ Fri Jun  4 12:29:16 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
 -------------------------------------------------------------------
 Thu May 20 23:16:09 UTC 2021 - Daniel Molkentin <daniel.molkentin@suse.com>
 
-- Enable vulkan on on Leap 15 
+- Enable vulkan on on Leap 15
 
 -------------------------------------------------------------------
 Fri Apr 16 10:20:15 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
@@ -327,8 +332,8 @@ Fri Apr  9 18:52:46 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
 Sun Mar 14 21:08:02 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
 - update to 4.3.2:
-  * lots of oss-fuzz reported overflow fixes, see included ChangeLog 
+  * lots of oss-fuzz reported overflow fixes, see included ChangeLog
-- drop 
+- drop
       ffmpeg.git-ba3e771a42c29ee02c34e7769cfc1b2dbc5c760a.patch
       0001-lavf-srt-fix-build-fail-when-used-the-libsrt-1.4.1.patch
       0001-avformat-vividas-improve-extradata-packing-checks-in.patch: upstream
@@ -344,7 +349,7 @@ Sun Jan 24 11:22:02 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
 - remove dependency on OpenJPEG, this is obsolete since ffmpeg 4.0,
   we already build against OpenJPEG 2.1.
-  see changes: 
+  see changes:
     - Dropped support for OpenJPEG versions 2.0 and below. Using OpenJPEG now
       requires 2.1 (or later) and pkg-config.
 
@@ -376,7 +381,7 @@ Mon Jul 27 13:39:27 UTC 2020 - Hans-Peter Jansen <hpj@urpla.net>
 -------------------------------------------------------------------
 Thu Jul 16 10:49:02 UTC 2020 - Alexander Reimelt <alexander.reimelt@protonmail.ch>
 
-- Add librav1e support 
+- Add librav1e support
 
 -------------------------------------------------------------------
 Sun Jul 12 16:08:10 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
@@ -443,7 +448,7 @@ Fri Mar 31 00:41:22 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
 - Add Samba support for Factory (as this needs a fix in Samba itself)
   Add --enable-libsmbclient to configure, add BR on pkgconfig(smbclient)
 - License is now GPLv3+ by default (--enable-version3)
-  
+
 -------------------------------------------------------------------
 Mon Mar 30 07:14:39 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
 

ffmpeg-4.spec

@@ -55,7 +55,11 @@
 %bcond_with    smbclient
 %bcond_with    x264
 %bcond_with    x265
+%if 0%{?suse_version} > 1600
+%bcond_without xvid
+%else
 %bcond_with    xvid
+%endif
 
 %if 0%{?suse_version} > 1500
 %bcond_without libaom
@@ -71,7 +75,6 @@
 %bcond_without vulkan
 %bcond_without amrwb
 %bcond_without opencore
-%bcond_without xvid
 %else
 %bcond_with libaom
 %bcond_with mysofa