forked from pool/ffmpeg-6
Restore ffmpeg-new-coder-errors.diff
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-6?expand=0&rev=23
This commit is contained in:
parent
05663f13a5
commit
eadb6322c5
@ -40,7 +40,6 @@ Mon Jan 15 11:11:08 UTC 2024 - Enrico Belleri <kilgore.trout@idesmi.eu>
|
|||||||
- Remove patch6 0001-avfilter-vf_libplacebo-remove-deprecated-field.diff
|
- Remove patch6 0001-avfilter-vf_libplacebo-remove-deprecated-field.diff
|
||||||
- Prefer libvpl to libmfx: the latter is deprecated
|
- Prefer libvpl to libmfx: the latter is deprecated
|
||||||
- Delete ffmpeg-6-private-devel package as it is only needed to build libav-tools
|
- Delete ffmpeg-6-private-devel package as it is only needed to build libav-tools
|
||||||
- Remove patch2 ffmpeg-new-coder-errors.diff
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Nov 22 15:23:54 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
Wed Nov 22 15:23:54 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
@ -106,6 +106,7 @@ Source98: http://ffmpeg.org/ffmpeg-devel.asc#/ffmpeg-6.keyring
|
|||||||
Source99: baselibs.conf
|
Source99: baselibs.conf
|
||||||
|
|
||||||
Patch1: ffmpeg-arm6l.diff
|
Patch1: ffmpeg-arm6l.diff
|
||||||
|
Patch2: ffmpeg-new-coder-errors.diff
|
||||||
Patch3: ffmpeg-codec-choice.diff
|
Patch3: ffmpeg-codec-choice.diff
|
||||||
Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch
|
Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch
|
||||||
Patch5: work-around-abi-break.patch
|
Patch5: work-around-abi-break.patch
|
||||||
@ -521,13 +522,7 @@ pixel format conversion operations.
|
|||||||
This subpackage contains the headers for FFmpeg libswscale.
|
This subpackage contains the headers for FFmpeg libswscale.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -a6 -n %_name-%version
|
%autosetup -p1 -a6 -n %_name-%version
|
||||||
%patch1 -p1
|
|
||||||
%patch3 -p1
|
|
||||||
%patch4 -p1
|
|
||||||
%patch5 -p1
|
|
||||||
%patch10 -p1
|
|
||||||
%patch91 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ifarch %ix86 %arm
|
%ifarch %ix86 %arm
|
||||||
|
23
ffmpeg-new-coder-errors.diff
Normal file
23
ffmpeg-new-coder-errors.diff
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
From: Jan Engelhardt <jengelh@inai.de>
|
||||||
|
Date: 2016-04-10 23:23:53.138440254 +0200
|
||||||
|
|
||||||
|
Improve the error messages a bit to say what's really going on
|
||||||
|
(in light of openSUSE's reduced build).
|
||||||
|
|
||||||
|
---
|
||||||
|
fftools/ffmpeg_dec.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
Index: ffmpeg-6.1.1/fftools/ffmpeg_dec.c
|
||||||
|
===================================================================
|
||||||
|
--- ffmpeg-6.1.1.orig/fftools/ffmpeg_dec.c
|
||||||
|
+++ ffmpeg-6.1.1/fftools/ffmpeg_dec.c
|
||||||
|
@@ -1075,7 +1075,7 @@ int dec_open(InputStream *ist)
|
||||||
|
|
||||||
|
if (!codec) {
|
||||||
|
av_log(ist, AV_LOG_ERROR,
|
||||||
|
- "Decoding requested, but no decoder found for: %s\n",
|
||||||
|
+ "Decoding was requested, but this build of ffmpeg does not include a \"%s\" decoder\n",
|
||||||
|
avcodec_get_name(ist->dec_ctx->codec_id));
|
||||||
|
return AVERROR(EINVAL);
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user