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

Accepting request 732021 from multimedia:libs

Browse Source 
- Update to version 4.2.1

OBS-URL: https://build.opensuse.org/request/show/732021
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-4?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger 2019-09-24 23:56:38 +00:00 committed by Git OBS Bridge
commit 0c01445c4e
7 changed files with 85 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
0001-avcodec-h2645_parse-zero-initialize-the-rbsp-buffer.patch
View File

@ -1,49 +0,0 @@
From af70bfbeadc0c9b9215cf045ff2a6a31e8ac3a71 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Mon, 26 Aug 2019 00:54:20 -0300
Subject: [PATCH] avcodec/h2645_parse: zero initialize the rbsp buffer
Fixes ticket #8093
Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavcodec/h2645_parse.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c
index 24658b3dfa..307e8643e6 100644
--- a/libavcodec/h2645_parse.c
+++ b/libavcodec/h2645_parse.c
@@ -345,13 +345,18 @@ static int find_next_start_code(const uint8_t *buf, const uint8_t *next_avc)
static void alloc_rbsp_buffer(H2645RBSP *rbsp, unsigned int size, int use_ref)
{
+ int min_size = size;
+
if (size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
goto fail;
size += AV_INPUT_BUFFER_PADDING_SIZE;
if (rbsp->rbsp_buffer_alloc_size >= size &&
- (!rbsp->rbsp_buffer_ref || av_buffer_is_writable(rbsp->rbsp_buffer_ref)))
+ (!rbsp->rbsp_buffer_ref || av_buffer_is_writable(rbsp->rbsp_buffer_ref))) {
+ av_assert0(rbsp->rbsp_buffer);
+ memset(rbsp->rbsp_buffer + min_size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
return;
+ }
size = FFMIN(size + size / 16 + 32, INT_MAX);
@@ -360,7 +365,7 @@ static void alloc_rbsp_buffer(H2645RBSP *rbsp, unsigned int size, int use_ref)
else
av_free(rbsp->rbsp_buffer);
- rbsp->rbsp_buffer = av_malloc(size);
+ rbsp->rbsp_buffer = av_mallocz(size);
if (!rbsp->rbsp_buffer)
goto fail;
rbsp->rbsp_buffer_alloc_size = size;
--
2.23.0

3
ffmpeg-4.2.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4
size 9090632

11
ffmpeg-4.2.1.tar.xz.asc Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJdctw9AAoJELQyLwTWdljYeg0H/3agc6Pk8PM7OlE3WVVfiSCt
1gHk6wmCzdvrpQhX7u0RP/O1i2mkSlX+ERlkBTssPN2NnvTJbBkg7oQDrRhIxo6E
FshW6wD+iJ91UL8suEC9fpBOfApG+Ef1JK5VPxKROcHH05Ni4yhae2vG1YQXoRDL
9SU0lQaXQd4L1D3O/sPipXl/iJhZONrq/npsL8/9xgxLQ6ziZw4GzIirfa0zLkYE
CiH0+9HTJk+9mdyCS9qDiHbzHrpWYfkc7d6/qOp+BhU6rNEGi30JTlhUHYpJL59y
7EnCDv5JFGLO4/a3hq6KtZw/ni4wTFKkyvF26kVSRkgI+7gUOo8mCifXRfgmpco=
=5hOA
-----END PGP SIGNATURE-----

3
ffmpeg-4.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:023f10831a97ad93d798f53a3640e55cd564abfeba807ecbe8524dac4fedecd5
size 9088756

11
ffmpeg-4.2.tar.xz.asc
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJdSJwGAAoJELQyLwTWdljYHXsIAJ5pXCQtJTZGBWDnIAqEiuJl
tk9UIFhptnHkQzAXLy1BxDa76MkI0MV9zvy5rl6BPyfWNhUPcvtgptQFTMLiCiub
FdIHwsTEgjRX1YqD8zwS4zsULXxGzXj3uR15zr5eJKueEjpq1NJtujUY88CkHGx3
hjR8y6oGxCM/SMNctD1HCZNoT2E3g3/wyW+M6+OcYAkRSI8Igf6XTFqvQHefQoUW
D227cAqJ1a9Ld1EwG30rZct4V22Wo4dUcfgNWU5eLu4xDaYiIeqRnsgqVH2kutXU
94vAFNLqj67D1atMzOyVRJf09XIpqeYTzJuOqyDdRLrM5GCO1a+7zEqx3ms+Jfk=
=3kLA
-----END PGP SIGNATURE-----

8
ffmpeg-4.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Sep 18 20:08:06 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 4.2.1:
* Stable bug fix release, mainly codecs and format fixes.
- Drop upstream fixed patch:
0001-avcodec-h2645_parse-zero-initialize-the-rbsp-buffer.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 10 08:30:36 UTC 2019 - Jan Engelhardt <jengelh@inai.de> Tue Sep 10 08:30:36 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

127
ffmpeg-4.spec
View File

@ -26,17 +26,17 @@
%define comparator %{-c:%{-c*}}%{!-c:%{error:Comparator not defined}} \ %define comparator %{-c:%{-c*}}%{!-c:%{error:Comparator not defined}} \
%define conflicts_version %{-v:%{-v*}}%{!-v:%{error:Version not defined}} \ %define conflicts_version %{-v:%{-v*}}%{!-v:%{error:Version not defined}} \
\ \
%{preamble_string} libavcodec-devel %{comparator} %{conflicts_version} \ %preamble_string libavcodec-devel %comparator %conflicts_version \
%{preamble_string} libavdevice-devel %{comparator} %{conflicts_version} \ %preamble_string libavdevice-devel %comparator %conflicts_version \
%{preamble_string} libavfilter-devel %{comparator} %{conflicts_version} \ %preamble_string libavfilter-devel %comparator %conflicts_version \
%{preamble_string} libavformat-devel %{comparator} %{conflicts_version} \ %preamble_string libavformat-devel %comparator %conflicts_version \
%{preamble_string} libavresample-devel %{comparator} %{conflicts_version} \ %preamble_string libavresample-devel %comparator %conflicts_version \
%{preamble_string} libavutil-devel %{comparator} %{conflicts_version} \ %preamble_string libavutil-devel %comparator %conflicts_version \
%{preamble_string} libpostproc-devel %{comparator} %{conflicts_version} \ %preamble_string libpostproc-devel %comparator %conflicts_version \
%{preamble_string} libswresample-devel %{comparator} %{conflicts_version} \ %preamble_string libswresample-devel %comparator %conflicts_version \
%{preamble_string} libswscale-devel %{comparator} %{conflicts_version} \ %preamble_string libswscale-devel %comparator %conflicts_version \
%{preamble_string} ffmpeg-private-devel %{comparator} %{conflicts_version} \ %preamble_string ffmpeg-private-devel %comparator %conflicts_version \
%{nil} %nil
# nvcodec headers only present after leap15 # nvcodec headers only present after leap15
%bcond_with nvcodec %bcond_with nvcodec
@ -97,7 +97,7 @@
%define _major_version 4 %define _major_version 4
%define _major_expected 5 %define _major_expected 5
Name: ffmpeg-4 Name: ffmpeg-4
Version: 4.2 Version: 4.2.1
Release: 0 Release: 0
Summary: Library for working with various multimedia formats Summary: Library for working with various multimedia formats
License: LGPL-2.1-or-later AND GPL-2.0-or-later License: LGPL-2.1-or-later AND GPL-2.0-or-later
@ -122,7 +122,6 @@ Patch6: ffmpeg-4.2-dlopen-fdk_aac.patch
# https://trac.ffmpeg.org/ticket/7861 # https://trac.ffmpeg.org/ticket/7861
Patch7: ffmpeg4_swscale_replace_illegal_vector_keyword.patch Patch7: ffmpeg4_swscale_replace_illegal_vector_keyword.patch
Patch8: ffmpeg4_swscale_fix_altivec_vsx_recent_gcc.patch Patch8: ffmpeg4_swscale_fix_altivec_vsx_recent_gcc.patch
Patch9: 0001-avcodec-h2645_parse-zero-initialize-the-rbsp-buffer.patch
BuildRequires: ladspa-devel BuildRequires: ladspa-devel
BuildRequires: libgsm-devel BuildRequires: libgsm-devel
BuildRequires: libmp3lame-devel BuildRequires: libmp3lame-devel
@ -242,8 +241,8 @@ BuildRequires: pkgconfig(x264)
%if %{with x265} %if %{with x265}
BuildRequires: pkgconfig(x265) BuildRequires: pkgconfig(x265)
%endif %endif
Provides: ffmpeg-tools = %{version} Provides: ffmpeg-tools = %version
Obsoletes: ffmpeg-tools < %{version} Obsoletes: ffmpeg-tools < %version
Provides: ffmpeg = %version Provides: ffmpeg = %version
Obsoletes: ffmpeg < %version Obsoletes: ffmpeg < %version
Requires: libavcodec58 = %version-%release Requires: libavcodec58 = %version-%release
@ -292,11 +291,11 @@ Summary: Development files for FFmpeg's codec library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: libavcodec-devel = %version-%release Provides: libavcodec-devel = %version-%release
Obsoletes: libavcodec-devel < %version-%release Obsoletes: libavcodec-devel < %version-%release
Requires: %{name}-libavresample-devel = %version-%release Requires: %name-libavresample-devel = %version-%release
Requires: %{name}-libavutil-devel = %version-%release Requires: %name-libavutil-devel = %version-%release
Requires: libavcodec58 = %version-%release Requires: libavcodec58 = %version-%release
%devel_conflicts -c < -v %{_major_version} %devel_conflicts -c < -v %_major_version
%devel_conflicts -c >= -v %{_major_expected} %devel_conflicts -c >= -v %_major_expected
%description libavcodec-devel %description libavcodec-devel
The libavcodec library provides a generic encoding/decoding framework The libavcodec library provides a generic encoding/decoding framework
@ -326,17 +325,17 @@ Provides: ffmpeg-devel = %version-%release
Conflicts: ffmpeg-devel Conflicts: ffmpeg-devel
Provides: libavdevice-devel = %version-%release Provides: libavdevice-devel = %version-%release
Obsoletes: libavdevice-devel < %version-%release Obsoletes: libavdevice-devel < %version-%release
Requires: %{name}-libavcodec-devel = %version-%release Requires: %name-libavcodec-devel = %version-%release
Requires: %{name}-libavfilter-devel = %version-%release Requires: %name-libavfilter-devel = %version-%release
Requires: %{name}-libavformat-devel = %version-%release Requires: %name-libavformat-devel = %version-%release
Requires: %{name}-libavresample-devel = %version-%release Requires: %name-libavresample-devel = %version-%release
Requires: %{name}-libavutil-devel = %version-%release Requires: %name-libavutil-devel = %version-%release
Requires: %{name}-libpostproc-devel = %version-%release Requires: %name-libpostproc-devel = %version-%release
Requires: %{name}-libswresample-devel = %version-%release Requires: %name-libswresample-devel = %version-%release
Requires: %{name}-libswscale-devel = %version-%release Requires: %name-libswscale-devel = %version-%release
Requires: libavdevice58 = %version-%release Requires: libavdevice58 = %version-%release
%devel_conflicts -c < -v %{_major_version} %devel_conflicts -c < -v %_major_version
%devel_conflicts -c >= -v %{_major_expected} %devel_conflicts -c >= -v %_major_expected
%description libavdevice-devel %description libavdevice-devel
The libavdevice library provides a generic framework for grabbing from The libavdevice library provides a generic framework for grabbing from
@ -366,16 +365,16 @@ Summary: Development files for FFmpeg's audio/video filter library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: libavfilter-devel = %version-%release Provides: libavfilter-devel = %version-%release
Obsoletes: libavfilter-devel < %version-%release Obsoletes: libavfilter-devel < %version-%release
Requires: %{name}-libavcodec-devel = %version-%release Requires: %name-libavcodec-devel = %version-%release
Requires: %{name}-libavformat-devel = %version-%release Requires: %name-libavformat-devel = %version-%release
Requires: %{name}-libavresample-devel = %version-%release Requires: %name-libavresample-devel = %version-%release
Requires: %{name}-libavutil-devel = %version-%release Requires: %name-libavutil-devel = %version-%release
Requires: %{name}-libpostproc-devel = %version-%release Requires: %name-libpostproc-devel = %version-%release
Requires: %{name}-libswresample-devel = %version-%release Requires: %name-libswresample-devel = %version-%release
Requires: %{name}-libswscale-devel = %version-%release Requires: %name-libswscale-devel = %version-%release
Requires: libavfilter7 = %version-%release Requires: libavfilter7 = %version-%release
%devel_conflicts -c < -v %{_major_version} %devel_conflicts -c < -v %_major_version
%devel_conflicts -c >= -v %{_major_expected} %devel_conflicts -c >= -v %_major_expected
%description libavfilter-devel %description libavfilter-devel
The libavfilter library provides a generic audio/video filtering The libavfilter library provides a generic audio/video filtering
@ -404,12 +403,12 @@ Summary: Development files for FFmpeg's stream format library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: libavformat-devel = %version-%release Provides: libavformat-devel = %version-%release
Obsoletes: libavformat-devel < %version-%release Obsoletes: libavformat-devel < %version-%release
Requires: %{name}-libavcodec-devel = %version-%release Requires: %name-libavcodec-devel = %version-%release
Requires: %{name}-libavutil-devel = %version-%release Requires: %name-libavutil-devel = %version-%release
Requires: %{name}-libswresample-devel = %version-%release Requires: %name-libswresample-devel = %version-%release
Requires: libavformat58 = %version-%release Requires: libavformat58 = %version-%release
%devel_conflicts -c < -v %{_major_version} %devel_conflicts -c < -v %_major_version
%devel_conflicts -c >= -v %{_major_expected} %devel_conflicts -c >= -v %_major_expected
%description libavformat-devel %description libavformat-devel
The libavformat library provides a generic framework for multiplexing The libavformat library provides a generic framework for multiplexing
@ -435,10 +434,10 @@ Summary: Development files for libavresample as present in FFmpeg
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: libavresample-devel = %version-%release Provides: libavresample-devel = %version-%release
Obsoletes: libavresample-devel < %version-%release Obsoletes: libavresample-devel < %version-%release
Requires: %{name}-libavutil-devel = %version-%release Requires: %name-libavutil-devel = %version-%release
Requires: libavresample4 = %version-%release Requires: libavresample4 = %version-%release
%devel_conflicts -c < -v %{_major_version} %devel_conflicts -c < -v %_major_version
%devel_conflicts -c >= -v %{_major_expected} %devel_conflicts -c >= -v %_major_expected
%description libavresample-devel %description libavresample-devel
An audio resampling library that is being provided for drop-in An audio resampling library that is being provided for drop-in
@ -465,8 +464,8 @@ Group: Development/Libraries/C and C++
Provides: libavutil-devel = %version-%release Provides: libavutil-devel = %version-%release
Obsoletes: libavutil-devel < %version-%release Obsoletes: libavutil-devel < %version-%release
Requires: libavutil56 = %version-%release Requires: libavutil56 = %version-%release
%devel_conflicts -c < -v %{_major_version} %devel_conflicts -c < -v %_major_version
%devel_conflicts -c >= -v %{_major_expected} %devel_conflicts -c >= -v %_major_expected
%description libavutil-devel %description libavutil-devel
The libavutil library is a utility library to aid portable multimedia The libavutil library is a utility library to aid portable multimedia
@ -492,10 +491,10 @@ Summary: Development files for the FFmpeg post-processing library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: libpostproc-devel = %version-%release Provides: libpostproc-devel = %version-%release
Obsoletes: libpostproc-devel < %version-%release Obsoletes: libpostproc-devel < %version-%release
Requires: %{name}-libavutil-devel = %version-%release Requires: %name-libavutil-devel = %version-%release
Requires: libpostproc55 = %version-%release Requires: libpostproc55 = %version-%release
%devel_conflicts -c < -v %{_major_version} %devel_conflicts -c < -v %_major_version
%devel_conflicts -c >= -v %{_major_expected} %devel_conflicts -c >= -v %_major_expected
%description libpostproc-devel %description libpostproc-devel
A library with video postprocessing filters, such as deblocking and A library with video postprocessing filters, such as deblocking and
@ -518,10 +517,10 @@ Summary: Development files for the FFmpeg software resampling library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: libswresample-devel = %version-%release Provides: libswresample-devel = %version-%release
Obsoletes: libswresample-devel < %version-%release Obsoletes: libswresample-devel < %version-%release
Requires: %{name}-libavutil-devel = %version-%release Requires: %name-libavutil-devel = %version-%release
Requires: libswresample3 = %version-%release Requires: libswresample3 = %version-%release
%devel_conflicts -c < -v %{_major_version} %devel_conflicts -c < -v %_major_version
%devel_conflicts -c >= -v %{_major_expected} %devel_conflicts -c >= -v %_major_expected
%description libswresample-devel %description libswresample-devel
The libswresample library performs audio conversion between different The libswresample library performs audio conversion between different
@ -543,10 +542,10 @@ Summary: Development files for FFmpeg's image scaling and colorspace libr
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: libswscale-devel = %version-%release Provides: libswscale-devel = %version-%release
Conflicts: libswscale-devel Conflicts: libswscale-devel
Requires: %{name}-libavutil-devel = %version-%release Requires: %name-libavutil-devel = %version-%release
Requires: libswscale5 = %version-%release Requires: libswscale5 = %version-%release
%devel_conflicts -c < -v %{_major_version} %devel_conflicts -c < -v %_major_version
%devel_conflicts -c >= -v %{_major_expected} %devel_conflicts -c >= -v %_major_expected
%description libswscale-devel %description libswscale-devel
The libswscale library performs image scaling and colorspace and The libswscale library performs image scaling and colorspace and
@ -557,13 +556,13 @@ This subpackage contains the headers for FFmpeg libswscale.
%package private-devel %package private-devel
Summary: Some FFmpeg private headers Summary: Some FFmpeg private headers
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name}-libavcodec-devel = %version-%release Requires: %name-libavcodec-devel = %version-%release
Requires: %{name}-libavformat-devel = %version-%release Requires: %name-libavformat-devel = %version-%release
Requires: %{name}-libavutil-devel = %version-%release Requires: %name-libavutil-devel = %version-%release
Provides: ffmpeg-private-devel = %version Provides: ffmpeg-private-devel = %version
Obsoletes: ffmpeg-private-devel < %version Obsoletes: ffmpeg-private-devel < %version
%devel_conflicts -c < -v %{_major_version} %devel_conflicts -c < -v %_major_version
%devel_conflicts -c >= -v %{_major_expected} %devel_conflicts -c >= -v %_major_expected
%description private-devel %description private-devel
FFmpeg is a multimedia framework, able to decode, encode, FFmpeg is a multimedia framework, able to decode, encode,
@ -581,10 +580,10 @@ break compatibility without any notice.
%build %build
%ifarch %ix86 %arm %ifarch %ix86 %arm
%define _lto_cflags %{nil} %define _lto_cflags %nil
%endif %endif
CFLAGS="%optflags" \ CFLAGS="%optflags" \
%if %{suse_version} > 1500 %if %suse_version > 1500
%ifarch %ix86 %ifarch %ix86
%else %else
LDFLAGS="%_lto_cflags" \ LDFLAGS="%_lto_cflags" \