pool/ffmpeg-4
SHA256
2
0
Fork 3
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[info=d4a851e48e2ef17c1f3c81416ee204973636088059021e1c36a028ddbb7991c7]

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=223
This commit is contained in:
OBS User unknown 2024-07-27 05:17:58 +00:00 committed by Git OBS Bridge
parent 54becce3cb
commit c64a29a42e
5 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_scmsync.obsinfo
View File

@ -1,4 +1,4 @@
mtime: 1715249247
commit: 90ca7e24a6cbe5b7139f3c99d355ae4ecd32b73586c4e953d7b4bf8e6d02cfaf
mtime: 1722057554
commit: d4a851e48e2ef17c1f3c81416ee204973636088059021e1c36a028ddbb7991c7
url: https://src.opensuse.org/jengelh/ffmpeg-4
revision: master

2
build.specials.obscpio
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3cbdcc668cfd69e99af24ae4f72a7d2e2cf5462a61581c9e234ac84bf1104965
oid sha256:8fc0c14f2bc24bf2dda12500e5d5712f81d17ee7a63baeb4b7401f60a0fcb4cb
size 256

6
ffmpeg-4.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 26 13:19:42 UTC 2024 - Filip Kastl <filip.kastl@suse.com>
- Add ffmpeg-c99.patch so that the package conforms to the C99
standard and builds on i586 with GCC 14.
-------------------------------------------------------------------
Tue Apr 27 11:38:35 UTC 2024 - Cliff Zhao <qzhao@suse.com>

1
ffmpeg-4.spec
View File

@ -131,6 +131,7 @@ Patch17: ffmpeg-CVE-2023-49502.patch
Patch18: ffmpeg-CVE-2023-51793.patch
Patch19: 0001-avfilter-af_stereowiden-Check-length.patch
Patch20: ffmpeg-CVE-2023-50010.patch
Patch21: ffmpeg-c99.patch
BuildRequires: ladspa-devel
BuildRequires: libgsm-devel
BuildRequires: libmp3lame-devel

37
ffmpeg-c99.patch Normal file
View File

@ -0,0 +1,37 @@
From: Filip Kastl <fkastl@opensuse.org>
Date: Fri, 26 Jul 2024 14:39:42 +0000
I based the package patch on this bug report (there's a patch in
the comments)
https://bugs.gentoo.org/936433
and on these patches
https://ffmpeg.org/pipermail/ffmpeg-devel/2023-December/318685.html
http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=5860a966d2fffbbda1af0014f0a4d37a21c4f2ca
Index: ffmpeg-4.4.4/libavutil/hwcontext_vaapi.c
===================================================================
--- ffmpeg-4.4.4.orig/libavutil/hwcontext_vaapi.c
+++ ffmpeg-4.4.4/libavutil/hwcontext_vaapi.c
@@ -1032,7 +1032,7 @@ static int vaapi_map_from_drm(AVHWFrames
uint32_t va_fourcc;
int err, i, j, k;
- unsigned long buffer_handle;
+ uintptr_t buffer_handle;
VASurfaceAttribExternalBuffers buffer_desc;
VASurfaceAttrib attrs[2] = {
{
Index: ffmpeg-4.4.4/libavutil/hwcontext_vulkan.c
===================================================================
--- ffmpeg-4.4.4.orig/libavutil/hwcontext_vulkan.c
+++ ffmpeg-4.4.4/libavutil/hwcontext_vulkan.c
@@ -862,7 +862,7 @@ static void free_exec_ctx(AVHWFramesCont
av_freep(&cmd->queues);
av_freep(&cmd->bufs);
- cmd->pool = NULL;
+ cmd->pool = VK_NULL_HANDLE;
}
static VkCommandBuffer get_buf_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd)