Packman Build Service PMBS

ffmpeg-4.changes Changed

ffmpeg-4.spec Changed

@@ -91,25 +91,20 @@
 %bcond_with openmpt
 %endif
 
-%define _name ffmpeg
 %define _major_version 4
 %define _major_expected 5
 Name:           ffmpeg-4
-Version:        4.4.3
+Version:        4.4.4
 Release:        0
 Summary:        Set of libraries for working with various multimedia formats
 License:        GPL-3.0-or-later
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 URL:            https://ffmpeg.org/
 
-#Freshcode-URL:    http://freshcode.club/projects/ffmpeg
-#Git-Clone:     git://source.ffmpeg.org/ffmpeg
-Source:         https://www.ffmpeg.org/releases/%_name-%version.tar.xz
-Source2:        https://www.ffmpeg.org/releases/%_name-%version.tar.xz.asc
+Source:         %name-%version.tar.xz
 Source3:        ffmpeg-4-rpmlintrc
 Source4:        enable_decoders
 Source5:        enable_encoders
-Source98:       http://ffmpeg.org/ffmpeg-devel.asc#/ffmpeg-4.keyring
 Source99:       baselibs.conf
 Patch1:         ffmpeg-arm6l.diff
 Patch2:         ffmpeg-new-coder-errors.diff
@@ -120,9 +115,6 @@
 Patch9:         ffmpeg-4.4-CVE-2020-22046.patch
 Patch10:        ffmpeg-chromium.patch
 Patch11:        ffmpeg-libglslang-detection.patch
-Patch12:        ffmpeg-CVE-2022-3964.patch
-Patch13:        ffmpeg-CVE-2022-3109.patch
-Patch14:        ffmpeg-CVE-2022-3341.patch
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
 BuildRequires:  libmp3lame-devel
@@ -132,7 +124,7 @@
 BuildRequires:  nasm
 BuildRequires:  pkg-config
 %ifarch x86_64
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} > 1500
 BuildRequires:  pkgconfig(SvtAv1Enc) >= 0.8.4
 %endif
 %endif
@@ -224,7 +216,7 @@
 BuildRequires:  pkgconfig(xcb-xfixes)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xfixes)
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
 %ifarch x86_64
 BuildRequires:  pkgconfig(libmfx)
 %endif
@@ -596,7 +588,7 @@
 break compatibility without any notice.
 
 %prep
-%autosetup -p1 -n %_name-%version
+%autosetup -p1
 
 %build
 %ifarch %ix86 %arm
@@ -678,7 +670,7 @@
 	--enable-librubberband \
 %endif
 %ifarch x86_64
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} > 1500
 	--enable-libsvtav1 \
 %endif
 %endif
@@ -717,7 +709,7 @@
 %if %{with lv2}
 	--enable-lv2 \
 %endif
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
 %ifarch x86_64
 	--enable-libmfx \
 %endif

ffmpeg-CVE-2022-3109.patch Deleted

ffmpeg-CVE-2022-3341.patch Deleted

@@ -1,44 +0,0 @@
-diff --unified --recursive --text --new-file --color ffmpeg-4.4.3.old/libavformat/nutdec.c ffmpeg-4.4.3.new/libavformat/nutdec.c
---- ffmpeg-4.4.3.old/libavformat/nutdec.c	2022-10-10 03:04:43.000000000 +0800
-+++ ffmpeg-4.4.3.new/libavformat/nutdec.c	2023-01-20 15:33:38.060002545 +0800
-@@ -358,8 +358,12 @@
-         ret = AVERROR(ENOMEM);
-         goto fail;
-     }
--    for (i = 0; i < stream_count; i++)
--        avformat_new_stream(s, NULL);
-+    for (i = 0; i < stream_count; i++) {
-+        if (!avformat_new_stream(s, NULL)) {
-+            ret = AVERROR(ENOMEM);
-+            goto fail;
-+        }
-+    }
- 
-     return 0;
- fail:
-@@ -807,19 +811,23 @@
-     NUTContext *nut = s->priv_data;
-     AVIOContext *bc = s->pb;
-     int64_t pos;
--    int initialized_stream_count;
-+    int initialized_stream_count, ret;
- 
-     nut->avf = s;
- 
-     /* main header */
-     pos = 0;
-+    ret = 0;
-     do {
-+        if (ret == AVERROR(ENOMEM))
-+            return ret;
-+
-         pos = find_startcode(bc, MAIN_STARTCODE, pos) + 1;
-         if (pos < 0 + 1) {
-             av_log(s, AV_LOG_ERROR, "No main startcode found.\n");
-             goto fail;
-         }
--    } while (decode_main_header(nut) < 0);
-+    } while ((ret = decode_main_header(nut)) < 0);
- 
-     /* stream headers */
-     pos = 0;

ffmpeg-CVE-2022-3964.patch Deleted

@@ -1,70 +0,0 @@
-diff --unified --recursive --text --new-file --color ffmpeg-4.4.old/libavcodec/rpzaenc.c ffmpeg-4.4.new/libavcodec/rpzaenc.c
---- ffmpeg-4.4.old/libavcodec/rpzaenc.c	2022-11-15 14:41:42.262978968 +0800
-+++ ffmpeg-4.4.new/libavcodec/rpzaenc.c	2022-11-15 14:43:37.183516204 +0800
-@@ -204,7 +204,7 @@
- 
-     // loop thru and compare pixels
-     for (y = 0; y < bi->block_height; y++) {
--        for (x = 0; x < bi->block_width; x++){
-+        for (x = 0; x < bi->block_width; x++) {
-             // TODO:  optimize
-             min_r = FFMIN(R(block_ptrx), min_r);
-             min_g = FFMIN(G(block_ptrx), min_g);
-@@ -276,7 +276,7 @@
-         return -1;
- 
-     for (i = 0; i < bi->block_height; i++) {
--        for (j = 0; j < bi->block_width; j++){
-+        for (j = 0; j < bi->block_width; j++) {
-             x = GET_CHAN(block_ptrj, xchannel);
-             y = GET_CHAN(block_ptrj, ychannel);
-             sumx += x;
-@@ -323,7 +323,7 @@
-     int max_err = 0;
- 
-     for (i = 0; i < bi->block_height; i++) {
--        for (j = 0; j < bi->block_width; j++){
-+        for (j = 0; j < bi->block_width; j++) {
-             int x_inc, lin_y, lin_x;
-             x = GET_CHAN(block_ptrj, xchannel);
-             y = GET_CHAN(block_ptrj, ychannel);
-@@ -418,7 +418,9 @@
-                                        uint16_t *dest_pixels,
-                                        const BlockInfo *bi, int block_counter)
- {
--    for (int y = 0; y < 4; y++) {
-+    const int y_size = FFMIN(4, bi->image_height - bi->row * 4);
-+
-+    for (int y = 0; y < y_size; y++) {
-         memcpy(dest_pixels, src_pixels, 8);
-         dest_pixels += bi->rowstride;
-         src_pixels += bi->rowstride;
-@@ -728,13 +730,14 @@
- 
-             if (err > s->sixteen_color_thresh) { // DO SIXTEEN COLOR BLOCK
-                 uint16_t *row_ptr;
--                int rgb555;
-+                int y_size, rgb555;
- 
-                 block_offset = get_block_info(&bi, block_counter);
- 
-                 row_ptr = &src_pixelsblock_offset;
-+                y_size = FFMIN(4, bi.image_height - bi.row * 4);
- 
--                for (int y = 0; y < 4; y++) {
-+                for (int y = 0; y < y_size; y++) {
-                     for (int x = 0; x < 4; x++){
-                         rgb555 = row_ptrx & ~0x8000;
- 
-@@ -743,6 +746,11 @@
-                     row_ptr += bi.rowstride;
-                 }
- 
-+                for (int y = y_size; y < 4; y++) {
-+                    for (int x = 0; x < 4; x++)
-+                        put_bits(&s->pb, 16, 0);
-+                }
-+
-                 block_counter++;
-             } else { // FOUR COLOR BLOCK
-                 block_counter += encode_four_color_block(min_color, max_color,

_service Added

ffmpeg-4-4.4.4.tar.xz Added

ffmpeg-4.4.3.tar.xz Deleted

ffmpeg-4.4.3.tar.xz.asc Deleted

ffmpeg-4.keyring Deleted

@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBE22rV0BCAC3DzRmA2XlhrqYv9HKoEvNHHf+PzosmCTHmYhWHDqvBxPkSvCl
-ipkbvJ4pBnVvcX6mW5QyKhspHm5j1X5ibe9Bt9/chS/obnIobmvF8shSUgjQ0qRW
-9c1aWOjvT26SxYQ1y9TmYCFwixeydGFHYKjAim+evGUccni5KMlfPoT3VTPtim78
-ufkr3E9Nco/Mobn/8APO0NmLEGWAM6ln/8J/c9h6a1QKnQyBqWfT0YnAaebafFaZ
-YwOtRdDG54VbJ4xwcHbCj5cKhTABk/QtBzDvnW4bG+uSpqdHbFZEY2JpURDuj/T3
-NudKQGzn0bYNpY1XY2l0pqs/btKHnBW0fVMjABEBAAG0NEZGbXBlZyByZWxlYXNl
-IHNpZ25pbmcga2V5IDxmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZz6JATgEEwECACIF
-Ak22rV0CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJELQyLwTWdljYKxUH
-/1fqzl7SKie2g4t4PJbqUbkLuMsC+CP6gp0dcVZOHkuUYAoD3PM3iVxpLBVyKIXI
-g7wMSTAtlIcYnzhWIpnoCBes6/O2Mrq6xHgGeTp6CDcm3LmmSYR1f5KdD8KUaA+l
-c/M/1fEnwrSs/UGDk6R6iUmbqwxPsbozlOvmUHOLbDZBnKrk9XfAJdUhAuFACrSA
-T+KF1jniz0OfNGd23SaHWRCphoRW9pXDc5FfkdaueBUvBvGv19ZNcDhcxT3/u6z2
-DaUFC0rLWqk8obo951jVvi/zOhB94Pw6u1SLvcTq3V1q5URWJtgSbpih9VRqxUbQ
-NbXduKGzbHz6Vwpkupz4JRe5AQ0ETbatXQEIANjYrygJi/fn1nlSg5Mz0l9KHDm4
-yfWtaOrXUjJcyiGe4G0XXJLGh45qxJ0DOKzi9id+9W4jby+kKuzG9O6Vn0iDeODO
-aOGnz4ua7Vu6d0AbYfNXZPWge/GCodo/ZD/qri1tPkLmRtT/sniahwy6LruPNHfF
-SRoNIjwbcD/IL+EbY1pL1/IFSzEAA1ZZamgmHgB7o9pwDIkK6HuvHMR/Y5MsoMfV
-fWV3ZGtA6v9z51CvnHsHPsADRSnUp7aYtR412SiAO4XodMLTA92L3LxgYhI4ma7D
-XZ8jgKg4JkKO+DXmoU63HtRdq/HZjeXJKk1JGJF3zCvP3DyIzZ8LWIjN8t0AEQEA
-AYkBHwQYAQIACQUCTbatXQIbDAAKCRC0Mi8E1nZY2LS8B/0bMoUAl4X9D0WQbL4l
-U0czCIOKOsvbHpIxivjCnOQxU23+PV5WZdoCCpSuAHGv+2OHzhNrij++P9BNTJeQ
-skxdS9FH4MZwy1IRSPrxegSxbCUpBI1rd0Zf7qb9BNPrHPTueWFV1uExOSB2Apsv
-WrKo2D8mR0uZAPYfYl2ToFVoa5PR7/+ii9WiJr/flF6qm7hoLpI5Bm4VcZh2GPsJ
-9Vo/8x/qOGwtdWHqBykYloKsrwD4U69rjn+d9feLoPBRgoVroXWQttt0sUnyoudz
-+x8ETJgPoNK3kQoDagApj4qAt83Ayac3HzNIuEJ7LdvfINIOprujnJ9vH4n04XLg
-I4EZ
-=Rjbw
------END PGP PUBLIC KEY BLOCK-----

Changes of Revision 3