jengelh/ffmpeg-4
SHA256
1
0
Fork 2
forked from pool/ffmpeg-4
Code Pull Requests 1 Activity

Accepting request 905444 from home:frispete:branches:multimedia:libs

Browse Source 
- Remove second hunk of ffmpeg-CVE-2020-22046.patch, that contains 
  a goto to a none existing label. In order to distinguish this
  patch from the original, I renamed it to
  ffmpeg-4.4-CVE-2020-22046.patch
- While at it, refresh the other patches with offsets

OBS-URL: https://build.opensuse.org/request/show/905444
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=167
This commit is contained in:
Jan Engelhardt 2021-07-10 10:30:49 +00:00 committed by Git OBS Bridge
parent 1e8f598ca6
commit 3ed162e90c
6 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ffmpeg-4.2-dlopen-fdk_aac.patch
View File

@ -1,7 +1,7 @@
Index: ffmpeg-4.2.1/configure Index: b/configure
=================================================================== ===================================================================
--- ffmpeg-4.2.1.orig/configure --- a/configure
+++ ffmpeg-4.2.1/configure +++ b/configure
@@ -232,6 +232,7 @@ External library support: @@ -232,6 +232,7 @@ External library support:
--enable-libdc1394 enable IIDC-1394 grabbing using libdc1394 --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394
and libraw1394 [no] and libraw1394 [no]
@ -10,7 +10,7 @@ Index: ffmpeg-4.2.1/configure
--enable-libflite enable flite (voice synthesis) support via libflite [no] --enable-libflite enable flite (voice synthesis) support via libflite [no]
--enable-libfontconfig enable libfontconfig, useful for drawtext filter [no] --enable-libfontconfig enable libfontconfig, useful for drawtext filter [no]
--enable-libfreetype enable libfreetype, needed for drawtext filter [no] --enable-libfreetype enable libfreetype, needed for drawtext filter [no]
@@ -1724,6 +1725,7 @@ EXTERNAL_LIBRARY_GPL_LIST=" @@ -1735,6 +1736,7 @@ EXTERNAL_LIBRARY_GPL_LIST="
EXTERNAL_LIBRARY_NONFREE_LIST=" EXTERNAL_LIBRARY_NONFREE_LIST="
decklink decklink
libfdk_aac libfdk_aac
@ -18,7 +18,7 @@ Index: ffmpeg-4.2.1/configure
openssl openssl
libtls libtls
" "
@@ -6203,6 +6205,7 @@ enabled libdrm && require_pkg @@ -6360,6 +6362,7 @@ enabled libdrm && require_pkg
enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
{ require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac &&
warn "using libfdk without pkg-config"; } } warn "using libfdk without pkg-config"; } }
@ -26,10 +26,10 @@ Index: ffmpeg-4.2.1/configure
flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs
enabled fontconfig && enable libfontconfig enabled fontconfig && enable libfontconfig
Index: ffmpeg-4.2.1/libavcodec/dlopen.h Index: b/libavcodec/dlopen.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ ffmpeg-4.2.1/libavcodec/dlopen.h +++ b/libavcodec/dlopen.h
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+#ifndef LOCALINC_DLOPEN_H +#ifndef LOCALINC_DLOPEN_H
+#define LOCALINC_DLOPEN_H +#define LOCALINC_DLOPEN_H
@ -43,10 +43,10 @@ Index: ffmpeg-4.2.1/libavcodec/dlopen.h
+ goto error; + goto error;
+ +
+#endif +#endif
Index: ffmpeg-4.2.1/libavcodec/libfdk-aacdec.c Index: b/libavcodec/libfdk-aacdec.c
=================================================================== ===================================================================
--- ffmpeg-4.2.1.orig/libavcodec/libfdk-aacdec.c --- a/libavcodec/libfdk-aacdec.c
+++ ffmpeg-4.2.1/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c
@@ -37,6 +37,54 @@ @@ -37,6 +37,54 @@
#define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS #define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS
#endif #endif
@ -102,7 +102,7 @@ Index: ffmpeg-4.2.1/libavcodec/libfdk-aacdec.c
enum ConcealMethod { enum ConcealMethod {
CONCEAL_METHOD_SPECTRAL_MUTING = 0, CONCEAL_METHOD_SPECTRAL_MUTING = 0,
CONCEAL_METHOD_NOISE_SUBSTITUTION = 1, CONCEAL_METHOD_NOISE_SUBSTITUTION = 1,
@@ -224,6 +272,11 @@ static av_cold int fdk_aac_decode_init(A @@ -229,6 +277,11 @@ static av_cold int fdk_aac_decode_init(A
FDKAACDecContext *s = avctx->priv_data; FDKAACDecContext *s = avctx->priv_data;
AAC_DECODER_ERROR err; AAC_DECODER_ERROR err;
@ -114,11 +114,11 @@ Index: ffmpeg-4.2.1/libavcodec/libfdk-aacdec.c
s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1); s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1);
if (!s->handle) { if (!s->handle) {
av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n"); av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n");
Index: ffmpeg-4.2.1/libavcodec/libfdk-aacenc.c Index: b/libavcodec/libfdk-aacenc.c
=================================================================== ===================================================================
--- ffmpeg-4.2.1.orig/libavcodec/libfdk-aacenc.c --- a/libavcodec/libfdk-aacenc.c
+++ ffmpeg-4.2.1/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c
@@ -34,6 +34,48 @@ @@ -35,6 +35,48 @@
#define FDKENC_VER_AT_LEAST(vl0, vl1) 0 #define FDKENC_VER_AT_LEAST(vl0, vl1) 0
#endif #endif
@ -167,7 +167,7 @@ Index: ffmpeg-4.2.1/libavcodec/libfdk-aacenc.c
typedef struct AACContext { typedef struct AACContext {
const AVClass *class; const AVClass *class;
HANDLE_AACENCODER handle; HANDLE_AACENCODER handle;
@@ -126,6 +168,11 @@ static av_cold int aac_encode_init(AVCod @@ -128,6 +170,11 @@ static av_cold int aac_encode_init(AVCod
int aot = FF_PROFILE_AAC_LOW + 1; int aot = FF_PROFILE_AAC_LOW + 1;
int sce = 0, cpe = 0; int sce = 0, cpe = 0;

18
ffmpeg-CVE-2020-22046.patch → ffmpeg-4.4-CVE-2020-22046.patch
View File

@ -10,11 +10,11 @@ Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
libavcodec/ac3enc.c | 5 +++-- libavcodec/ac3enc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-) 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c Index: b/libavcodec/ac3enc.c
index 76872a8fe0..25318f8631 100644 ===================================================================
--- a/libavcodec/ac3enc.c --- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c
@@ -2051,7 +2051,8 @@ av_cold int ff_ac3_encode_close(AVCodecContext *avctx) @@ -2148,7 +2148,8 @@ av_cold int ff_ac3_encode_close(AVCodecC
av_freep(&block->cpl_coord_mant); av_freep(&block->cpl_coord_mant);
} }
@ -24,15 +24,3 @@ index 76872a8fe0..25318f8631 100644
return 0; return 0;
} }
@@ -2433,7 +2434,7 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx)
ret = validate_options(s);
if (ret)
- return ret;
+ goto init_fail;
avctx->frame_size = AC3_BLOCK_SIZE * s->num_blocks;
avctx->initial_padding = AC3_BLOCK_SIZE;
--
2.32.0

9
ffmpeg-4.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat Jul 10 10:11:32 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
- Remove second hunk of ffmpeg-CVE-2020-22046.patch, that contains
a goto to a none existing label. In order to distinguish this
patch from the original, I renamed it to
ffmpeg-4.4-CVE-2020-22046.patch
- While at it, refresh the other patches with offsets
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 8 06:43:28 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com> Thu Jul 8 06:43:28 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>

2
ffmpeg-4.spec
View File

@ -117,7 +117,7 @@ Patch3: ffmpeg-codec-choice.diff
Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch
Patch5: soversion.patch Patch5: soversion.patch
Patch8: vmaf-trim-usr-local.patch Patch8: vmaf-trim-usr-local.patch
Patch9: ffmpeg-CVE-2020-22046.patch Patch9: ffmpeg-4.4-CVE-2020-22046.patch
Patch10: ffmpeg-CVE-2021-33815.patch Patch10: ffmpeg-CVE-2021-33815.patch
BuildRequires: ladspa-devel BuildRequires: ladspa-devel
BuildRequires: libgsm-devel BuildRequires: libgsm-devel

10
ffmpeg-codec-choice.diff
View File

@ -11,11 +11,11 @@ reduced codec selection list.
libavformat/matroskaenc.c | 19 +++++++++++++------ libavformat/matroskaenc.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-) 1 file changed, 13 insertions(+), 6 deletions(-)
Index: ffmpeg-4.3/libavformat/matroskaenc.c Index: b/libavformat/matroskaenc.c
=================================================================== ===================================================================
--- ffmpeg-4.3.orig/libavformat/matroskaenc.c --- a/libavformat/matroskaenc.c
+++ ffmpeg-4.3/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c
@@ -2805,16 +2805,24 @@ static const AVClass matroska_class = { @@ -2834,16 +2834,24 @@ static const AVClass matroska_class = {
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };
@ -44,7 +44,7 @@ Index: ffmpeg-4.3/libavformat/matroskaenc.c
.init = mkv_init, .init = mkv_init,
.deinit = mkv_deinit, .deinit = mkv_deinit,
.write_header = mkv_write_header, .write_header = mkv_write_header,
@@ -2876,8 +2884,7 @@ AVOutputFormat ff_matroska_audio_muxer = @@ -2905,8 +2913,7 @@ AVOutputFormat ff_matroska_audio_muxer =
.mime_type = "audio/x-matroska", .mime_type = "audio/x-matroska",
.extensions = "mka", .extensions = "mka",
.priv_data_size = sizeof(MatroskaMuxContext), .priv_data_size = sizeof(MatroskaMuxContext),

8
soversion.patch
View File

@ -24,11 +24,11 @@ what dlopening programs have to deal with.
configure | 4 ++-- configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
Index: ffmpeg-4.3.1/configure Index: b/configure
=================================================================== ===================================================================
--- ffmpeg-4.3.1.orig/configure --- a/configure
+++ ffmpeg-4.3.1/configure +++ b/configure
@@ -3794,10 +3794,10 @@ SLIBPREF="lib" @@ -3833,10 +3833,10 @@ SLIBPREF="lib"
SLIBSUF=".so" SLIBSUF=".so"
SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF)' SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF)'
SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)' SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'