pool/ffmpeg-7
SHA256
12
0
Fork 2
Code Issues Pull Requests Activity

[info=e2cfa392ea5ec5c8759e17515fb74d51aa2b02f06ee8727322a04a4a623387f5]

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-7?expand=0&rev=18
This commit is contained in:
OBS User unknown
2024-10-01 10:50:51 +00:00
committed by Git OBS Bridge
parent b4e814daa8
commit 33b0312119
5 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch Normal file
View File

@@ -0,0 +1,27 @@
From: François Cartegnie <fcvlcdev@free.fr>
Date: Mon, 13 May 2024 11:37:27 +0000
Subject: avcodec/decode: clean-up if get_hw_frames_parameters fails
https://trac.ffmpeg.org/ticket/11013
https://code.videolan.org/videolan/vlc/-/issues/28811
Fixes the following assert:
[00007f1df83d17e0] vaapi generic error: avcodec_get_hw_frames_parameters failed: -22
Assertion p_dst->hwaccel_threadsafe || (!dst->hwaccel && !dst->internal->hwaccel_priv_data) failed at libavcodec/pthread_frame.c:349
Reproduced from VLC with VAAPI, when fallbacking from hw to sw.
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -344,6 +344,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
return err;
}
+ // hwaccel could have failed init due to some params
+ if(!dst->hwaccel && dst->internal->hwaccel_priv_data)
+ ff_hwaccel_uninit(dst);
+
// reset dst hwaccel state if needed
av_assert0(p_dst->hwaccel_threadsafe ||
(!dst->hwaccel && !dst->internal->hwaccel_priv_data));

4
_scmsync.obsinfo
View File

@@ -1,4 +1,4 @@
mtime: 1726646751
commit: baf5b4d95469634449521f7aa2b6937ad73458dc9e02f8350a818e586f36a5ed
mtime: 1727699696
commit: e2cfa392ea5ec5c8759e17515fb74d51aa2b02f06ee8727322a04a4a623387f5
url: https://src.opensuse.org/jengelh/ffmpeg-7
revision: master

2
build.specials.obscpio
View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7fc5a2f40e8e3ff91bd78903908c4de7c659d0f014eb26b9d87da75eab27b5f5
oid sha256:97596e7820680c80239f45adf98183d70aaf3ea2e7e218bee5f41528c87510ea
size 256

13
ffmpeg-7.changes
View File

@@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Sep 30 12:34:56 UTC 2024 - olaf@aepfle.de
- Fix assertion due to missing priv_data cleanup on failed VAAPI
acceleration with 11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch
(ffmpeg#11013, vlc#28811)
-------------------------------------------------------------------
Thu Sep 26 10:02:20 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- no longer build against libmfx; build also 15.5 against libvpl
(boo#1230983)
-------------------------------------------------------------------
Wed Aug 21 09:58:42 UTC 2024 - Jan Engelhardt <jengelh@inai.de>

14
ffmpeg-7.spec
View File

@@ -111,6 +111,7 @@ Patch10: ffmpeg-chromium.patch
Patch91: ffmpeg-dlopen-openh264.patch
Patch95: ffmpeg-7-fix-crashes.patch
Patch96: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
Patch15: 11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch
BuildRequires: ladspa-devel
BuildRequires: libgsm-devel
BuildRequires: libmp3lame-devel >= 3.98.3
@@ -230,11 +231,7 @@ BuildRequires: pkgconfig(shaderc) >= 2019.1
BuildRequires: pkgconfig(vulkan) >= 1.3.255
%endif
%if 0%{?suse_version} < 1550 && 0%{?sle_version} >= 150200 && 0%{?sle_version} < 150600
%ifarch x86_64 %x86_64
BuildRequires: pkgconfig(libmfx)
%endif
%else
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150500
%ifarch x86_64 %x86_64
BuildRequires: pkgconfig(vpl) >= 2.6
%endif
@@ -631,11 +628,7 @@ LDFLAGS="%_lto_cflags" \
%endif
%endif
--enable-lv2 \
%if 0%{?suse_version} < 1550 && 0%{?sle_version} >= 150200 && 0%{?sle_version} < 150600
%ifarch x86_64 %x86_64
--enable-libmfx \
%endif
%else
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150500
%ifarch x86_64 %x86_64
--enable-libvpl \
%endif
@@ -825,6 +818,7 @@ Patch10: ffmpeg-chromium.patch
Patch91: ffmpeg-dlopen-openh264.patch
Patch95: ffmpeg-7-fix-crashes.patch
Patch96: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
Patch15: 11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch
BuildRequires: c_compiler
Requires: this-is-only-for-build-envs