diff --git a/enable_decoders b/enable_decoders index 75aea0c..805166c 100644 --- a/enable_decoders +++ b/enable_decoders @@ -14,8 +14,14 @@ ffwavesynth # pseudo flac # libFLAC gif # libpng gsm # libgsm +h264_nvdec # hardware +h264_vdpau # hardware +h264_vaapi # hardware h264_v4l2m2m # hardware h264_qsv # hardware +hevc_nvdec # hardware +hevc_vdpau # hardware +hevc_vaapi # hardware hevc_qsv # hardware huffyuv # trivial+zlib ilbc # ilbc diff --git a/enable_encoders b/enable_encoders index db4377d..d4225f5 100644 --- a/enable_encoders +++ b/enable_encoders @@ -9,11 +9,16 @@ ffv1 ffvhuff # trivial+zlib flac # libFLAC gif # libpng +h264_amf # hardware +h264_nvenc # hardware h264_qsv # hardware h264_v4l2m2m # hardware h264_vaapi # hardware +hevc_amf # hardware +hevc_nvenc # hardware hevc_qsv # hardware hevc_v4l2m2m # hardware +hevc_vaapi # hardware huffyuv # trivial+zlib jpegls jpeg2000 diff --git a/ffmpeg.spec b/ffmpeg.spec index 24d328f..c41cdcd 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -65,7 +65,7 @@ Name: ffmpeg %global pkg_name %{name}%{?pkg_suffix} Version: 5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A complete solution to record, convert and stream audio and video License: GPLv3+ URL: https://ffmpeg.org/ @@ -103,6 +103,7 @@ Requires: libpostproc%{?pkg_suffix}%{_isa} = %{version}-%{release} Requires: libswresample%{?pkg_suffix}%{_isa} = %{version}-%{release} Requires: libswscale%{?pkg_suffix}%{_isa} = %{version}-%{release} +BuildRequires: AMF-devel BuildRequires: fdk-aac-free-devel BuildRequires: flite-devel BuildRequires: game-music-emu-devel @@ -660,7 +661,7 @@ for i in MPEG4 H263 H263P LIBX264 LIBX264RGB LIBX265 LIBXVID; do grep -q "#define CONFIG_${i}_ENCODER 0" config.h done for i in H264 HEVC; do - for j in AMF MF NVENC VIDEOTOOLBOX; do + for j in MF VIDEOTOOLBOX; do grep -q "#define CONFIG_${i}_${j}_ENCODER 0" config.h done done @@ -799,5 +800,8 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples %{_mandir}/man3/libswscale.3* %changelog +* Sun Feb 13 2022 Neal Gompa - 5.0-2 +- Enable support for more hardware codecs + * Fri Feb 11 2022 Andreas Schneider - 5.0-1 - Initial import (fedora#2051008) diff --git a/ffmpeg_free_sources b/ffmpeg_free_sources index 2694a9a..74a69dc 100644 --- a/ffmpeg_free_sources +++ b/ffmpeg_free_sources @@ -224,6 +224,9 @@ libavcodec/adx.h libavcodec/adx_parser.c libavcodec/allcodecs.c libavcodec/alpha/Makefile +libavcodec/amfenc.c +libavcodec/amfenc_h264.c +libavcodec/amfenc_hevc.c libavcodec/amr_parser.c libavcodec/ansi.c libavcodec/apng.h @@ -829,6 +832,9 @@ libavcodec/nvdec_mjpeg.c libavcodec/nvdec_mpeg12.c libavcodec/nvdec_vp8.c libavcodec/nvdec_vp9.c +libavcodec/nvenc.c +libavcodec/nvenc_h264.c +libavcodec/nvenc_hevc.c libavcodec/options.c libavcodec/options_table.h libavcodec/opus.c @@ -1032,6 +1038,7 @@ libavcodec/vaapi_decode.h libavcodec/vaapi_encode.c libavcodec/vaapi_encode.h libavcodec/vaapi_encode_h264.c +libavcodec/vaapi_encode_h265.c libavcodec/vaapi_hevc.h libavcodec/vaapi_mjpeg.c libavcodec/vaapi_mpeg2.c diff --git a/sources b/sources index 515841e..65aec54 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (ffmpeg-free-5.0.tar.xz) = f5bac72652c2e00beea3bdb204253d86ee42c14332d9d9652bbed6e0e92a37b3d9a67bef11d02836db27cfb30f6638ae32f132afb095bab0ca810ccbb44b96e5 +SHA512 (ffmpeg-free-5.0.tar.xz) = 523001749ad31652e31ed7c5c392f7aa3546f6e8c842ab290552429b0729b6f769aec650dcb9a3572f3972acb66fb7eeb4769424c328dea91828c72dd7576671 SHA512 (ffmpeg-5.0.tar.xz.asc) = 9238fcdc849895147a26669ac90fec94002af86e81270128f6eb0448d74487d8ba06ee08d10686a7a6e204689716ee744bfffc2a39466940940609cfcd7dfa85 SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165