From cd7299b0eeef9f9b0d0a6f7e66eb98e52973057a Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Tue, 19 Apr 2022 00:30:14 +0200 Subject: [PATCH] Properly enable decoding and encoding ilbc The --enable-libilbc flag has no effect if libilbc decoder and encoder are missing from enable_decoders and enable_encoders, respectively. Merges: https://src.fedoraproject.org/rpms/ffmpeg/pull-request/4 --- enable_decoders | 1 + enable_encoders | 2 ++ ffmpeg.spec | 5 ++++- ffmpeg_free_sources | 1 + sources | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/enable_decoders b/enable_decoders index b4e0e60..137bff0 100644 --- a/enable_decoders +++ b/enable_decoders @@ -24,6 +24,7 @@ libcelt # celt, opus libcodec2 # codec2 libdav1d # av1 libgsm # libgsm +libilbc # ilbc libopenh264 # openh264_dlopen libopenjpeg # openjpeg libopus # opus diff --git a/enable_encoders b/enable_encoders index 96311fc..979285e 100644 --- a/enable_encoders +++ b/enable_encoders @@ -21,12 +21,14 @@ hevc_qsv # hardware hevc_v4l2m2m # hardware hevc_vaapi # hardware huffyuv # trivial+zlib +ilbc # ilbc jpegls jpeg2000 libaom # libaom libaom_av1 # libaom libcodec2 # codec2 libgsm # libgsm +libilbc # ilbc libmp3lame # lame libopenh264 # openh264_dlopen libopenjpeg # openjpeg diff --git a/ffmpeg.spec b/ffmpeg.spec index 76afcfa..11b09af 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -69,7 +69,7 @@ Name: ffmpeg %global pkg_name %{name}%{?pkg_suffix} Version: 5.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A complete solution to record, convert and stream audio and video License: GPLv3+ URL: https://ffmpeg.org/ @@ -837,6 +837,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples %{_mandir}/man3/libswscale.3* %changelog +* Mon Apr 18 2022 Dominik Mierzejewski - 5.0.1-2 +- Properly enable decoding and encoding ilbc + * Tue Apr 12 2022 Neal Gompa - 5.0.1-1 - Update to 5.0.1 to fix crashes with muxing MP4 video (#2073980) diff --git a/ffmpeg_free_sources b/ffmpeg_free_sources index 54d3d1f..813805c 100644 --- a/ffmpeg_free_sources +++ b/ffmpeg_free_sources @@ -681,6 +681,7 @@ libavcodec/libfdk-aacdec.c libavcodec/libfdk-aacenc.c libavcodec/libgsmdec.c libavcodec/libgsmenc.c +libavcodec/libilbc.c libavcodec/libmp3lame.c libavcodec/libopenh264.c libavcodec/libopenh264.h diff --git a/sources b/sources index 98a3821..e48e40a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (ffmpeg-free-5.0.1.tar.xz) = f938e5ffb85ccba4a8855017a03e1a94c9497b7257c57afb6d7cd66e9c894d9adec75a00e6806e90b6114da9dc794b3e8bc0bfdf54f01786123631a62f990309 +SHA512 (ffmpeg-free-5.0.1.tar.xz) = 9f339a836483d027faf093a713066e790d888d9992434e5eb380129c4e2a1a187aa9fe34164911120db4d7ad52a8a36e467afceaa2f9c427aad2b8c18a6beacb SHA512 (ffmpeg-5.0.1.tar.xz.asc) = 9c4bd404196c3a3808bae92873aefc77f8c26a9419cc6130a3f2359a75c8e83189d206e9aee8ff85c5a7fe4a98da24e11cf607ec351386c18979ec2d5ad3b3ad SHA512 (ffmpeg-dlopen-headers.tar.xz) = ef47b5a8b5ef5c8c57b2372170ccda3fd6897572ab5aff5e3cd1dd3bbe1f892e42d9f89d1c159c79052a8ac57c42d4a2ebc8636d6f932df00b57f8010c5bfd3b SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165