forked from pool/ffmpeg-6
Compare commits
1 Commits
Author | SHA256 | Date | |
---|---|---|---|
98a7b93c54 |
@@ -1,27 +0,0 @@
|
||||
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));
|
@@ -1,9 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 30 12:34:56 UTC 2024 - olaf@aepfle.de
|
||||
Sun Sep 29 07:36:13 UTC 2024 - Cliff Zhao <qzhao@suse.com>
|
||||
|
||||
- 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)
|
||||
- Update ffmpeg-6.spec:
|
||||
Disable xvid plugin build and dependence, since legal reviewers
|
||||
are concerned xvid patents have not expired in Brazil, which should
|
||||
not be used in a commercial context.
|
||||
https://en.wikipedia.org/wiki/Xvid
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 26 10:02:20 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
@@ -59,7 +59,13 @@
|
||||
%bcond_with smbclient
|
||||
%bcond_with x264
|
||||
%bcond_with x265
|
||||
|
||||
# openSUSE legal reviewers are concerned xvid patents and should not be used in commercial context.
|
||||
%if !0%{?is_opensuse}
|
||||
%bcond_with xvid
|
||||
%else
|
||||
%bcond_without xvid
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} > 1500
|
||||
%bcond_without mysofa
|
||||
@@ -69,7 +75,6 @@
|
||||
%bcond_without vulkan
|
||||
%bcond_without amrwb
|
||||
%bcond_without opencore
|
||||
%bcond_without xvid
|
||||
%else
|
||||
%bcond_with mysofa
|
||||
%bcond_with vidstab
|
||||
@@ -89,9 +94,6 @@ 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
|
||||
Source3: ffmpeg-6-rpmlintrc
|
||||
@@ -116,7 +118,6 @@ Patch11: 0001-avfilter-af_dialoguenhance-do-output-scaling-once.patch
|
||||
Patch12: 0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch
|
||||
Patch13: 0001-avfilter-vf_codecview-fix-heap-buffer-overflow.patch
|
||||
Patch14: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
|
||||
Patch15: 11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch
|
||||
Patch90: ffmpeg-chromium.patch
|
||||
Patch91: ffmpeg-dlopen-openh264.patch
|
||||
Patch92: ffmpeg-CVE-2023-50007.patch
|
||||
@@ -672,6 +673,8 @@ LDFLAGS="%_lto_cflags" \
|
||||
%endif
|
||||
%if %{with xvid}
|
||||
--enable-libxvid \
|
||||
%else
|
||||
--disable-libxvid \
|
||||
%endif
|
||||
%if !0%{?BUILD_ORIG}
|
||||
--enable-muxers \
|
||||
@@ -840,7 +843,6 @@ Patch11: 0001-avfilter-af_dialoguenhance-do-output-scaling-once.patch
|
||||
Patch12: 0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch
|
||||
Patch13: 0001-avfilter-vf_codecview-fix-heap-buffer-overflow.patch
|
||||
Patch14: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
|
||||
Patch15: 11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch
|
||||
Patch90: ffmpeg-chromium.patch
|
||||
Patch91: ffmpeg-dlopen-openh264.patch
|
||||
Patch92: ffmpeg-CVE-2023-50007.patch
|
||||
|
Reference in New Issue
Block a user