Enable more approved codecs

Additionally, add a script used for making the source file list
easier to populate as new codecs are added.

enable_decoders

@@ -1,75 +1,305 @@
 ## module name # reason for enablement in ffmpeg (usually there is another package that already got legal review)
+aac
+aasc
 libfdk_aac # fdk-aac-free
 ac3
+acelp_kelvin
+adpcm_4xm
+adpcm_adx
+adpcm_afc
+adpcm_agm
+adpcm_aica
+adpcm_argo
+adpcm_ct
+adpcm_dtk
+adpcm_ea
+adpcm_ea_maxis_xa
+adpcm_ea_r1
+adpcm_ea_r2
+adpcm_ea_r3
+adpcm_ea_xas
+adpcm_g722
+adpcm_g726
+adpcm_g726le
+adpcm_ima_acorn
+adpcm_ima_alp
+adpcm_ima_amv
+adpcm_ima_apc
+adpcm_ima_apm
+adpcm_ima_cunning
+adpcm_ima_dat4
+adpcm_ima_dk3
+adpcm_ima_dk4
+adpcm_ima_ea_eacs
+adpcm_ima_ea_sead
+adpcm_ima_iss
+adpcm_ima_moflex
+adpcm_ima_mtf
+adpcm_ima_oki
+adpcm_ima_qt
+adpcm_ima_qt_at
+adpcm_ima_rad
+adpcm_ima_smjpeg
+adpcm_ima_ssi
+adpcm_ima_wav
+adpcm_ima_ws
+adpcm_ms
+adpcm_mtaf
+adpcm_psx
+adpcm_sbpro_2
+adpcm_sbpro_3
+adpcm_sbpro_4
+adpcm_swf
+adpcm_thp
+adpcm_thp_le
+adpcm_vima
+adpcm_xa
+adpcm_yamaha
+adpcm_zork
+alac
+alias_pix
+amrnb
+amrwb
+amv
+anm
 ansi # trivial
+ape
 apng # animated png
+arbc
+argo
 ass # trivial
+asv1
+asv2
+atrac1
+atrac3
+atrac3al
+atrac3p
+atrac3pal
+aura
+aura2
+av1 # libaom
 av1_qsv # libaom
 ayuv # trivial
+bethsoftvid # trivial
+bfi # trivial
+bink
+binkaudio_dct
+binkaudio_rdft
+bintext
+bitpacked # trivial
 bmp # trivial
+bmv_audio
+bmv_video
+brender_pix
+c93
+ccaption
+cdgraphics
+cdtoons
+cdxl
+cinepak
+clearvideo
+cljr
+cook
+cpia
+cscd
+cyuv
+dca
+dds
+derf_dpcm
+dfa
+dfpwm
 dirac # dirac
+dnxhd
+dolby_e
+dpx
+dsd_lsbf
+dsd_msbf
+dsicinaudio
+dsicinvideo
+dss_sp
+dvaudio
+dvbsub
+dvdsub
+dvvideo
+dxa
+dxtory
+eacmv
+eamad
+eatgq
+eatgv
+eatqi
+eightbps
+eightsvx_exp
+eightsvx_fib
+escape124
+escape130
+evrc
 exr # openEXR
 ffv1 # ffmpeg
 ffvhuff # ffmpeg
 ffwavesynth # pseudo
+fits
 flac # libFLAC
+flashsv
+flashsv2
+flic
+flv
+fmvc
+fourxm
+g723_1
+g729
+gdv
+gem
 gif # libpng
+gremlin_dpcm
 gsm # libgsm
+gsm_ms
+gsm_ms_at
+h261
+h263
+h263_v4l2m2m
+h263i
+h263p
+hap
+hca
+hcom
+hnm4_video
+hq_hqa
+hqx
 huffyuv # trivial+zlib
+hymt # huffyuv-mt
+iac
+idcin
+idf
+iff_ilbm
 ilbc # ilbc
+imc
+indeo2
+indeo3
+indeo4
+indeo5
+interplay_acm
+interplay_dpcm
+interplay_video
+ipu
+jacosub
 jpeg2000 # openjpeg2
+jpegls
+jv
+kgv1
+kmvc
+lagarith
 libaom # libaom
 libaom_av1 # libaom
 libcodec2 # codec2
 libdav1d # av1
 libgsm # libgsm
+libgsm_ms # libgsm
 libilbc # ilbc
 libjxl # libjxl
+libopencore_amrnb # opencore-amr
+libopencore_amrwb # opencore-amr
 libopenh264 # openh264_dlopen
 libopenjpeg # openjpeg
 libopus # opus
+librsvg # librsvg
 libschroedinger # schroedinger
 libspeex # speex
 libvorbis # libvorbis
 libvpx_vp8 # libvpx
 libvpx_vp9 # libvpx
 libzvbi_teletext # zvbi
+loco
+lscr
+m101
+mace3
+mace6
+mdec
+metasound
+microdvd
+mimic
 mjpeg # mjpegtools
 mjpeg_qsv # mjpegtools
+mjpegb
+mlp
+mmvideo
+motionpixels
 mp1 # twolame/lame
 mp1float # twolame/lame
 mp2 # twolame
 mp2float # twolame
 mp3 # lame
+mp3adu
+mp3adufloat
 mp3float # lame
+mp3on4
+mp3on4float
+mpc7
+mpc8
 mpeg1video
 mpeg1_v4l2m2m
 mpeg2video
 mpeg2_qsv
 mpeg2_v4l2m2m
+mpeg4
+mpeg4_v4l2m2m
+mpegvideo
+mpl2
+msa1
+mscc
+msmpeg4v1
+msmpeg4v2
+msmpeg4v3
+msnsiren
+msp2
+msrle
+mss1
+mss2
+msvideo1
+mszh
+mts2
+mv30
+mvc1
+mvc2
+mvdv
+mvha
+mwsc
+mxpeg
+nellymoser
+nuv
+on2avc
 opus # libopus
+paf_audio
+paf_video
 pam # trivial
 pbm # trivial
 pcm_alaw # trivial
 pcm_bluray
 pcm_dvd
+pcm_f16le # trivial
+pcm_f24le # trivial
 pcm_f32be # trivial
 pcm_f32le # trivial
 pcm_f64be # trivial
 pcm_f64le # trivial
+pcm_lxf # trivial
 pcm_mulaw # trivial
 pcm_s16be # trivial
 pcm_s16be_planar # trivial
 pcm_s16le # trivial
 pcm_s16le_planar # trivial
 pcm_s24be # trivial
+pcm_s24daud # trivial
 pcm_s24le # trivial
 pcm_s24le_planar # trivial
 pcm_s32be # trivial
 pcm_s32le # trivial
 pcm_s32le_planar # trivial
+pcm_s64be # trivial
+pcm_s64le # trivial
 pcm_s8 # trivial
 pcm_s8_planar # trivial
+pcm_sga # trivial
 pcm_u16be # trivial
 pcm_u16le # trivial
 pcm_u24be # trivial
@@ -77,44 +307,151 @@ pcm_u24le # trivial
 pcm_u32be # trivial
 pcm_u32le # trivial
 pcm_u8 # trivial
+pcm_vidc # trivial
 pcx
+pfm # trivial
 pgm # trivial
 pgmyuv # trivial
 pgssub # mkvtoolnix
 pgx
+phm # trivial
+photocd
+pictor
+pjs
 png # libpng
 ppm # trivial
+prosumer
+psd
+ptx
+qcelp
+qdm2
+qdmc
+qdraw
+qoi
+qpeg
+qtrle
+r10k
+r210
+ra_144
+ra_288
+rasc
 rawvideo # trivial
+realtext
+rl2
+roq
+roq_dpcm
+rpza
+rscc
+rv10
+rv20
+s302m
+sami
+sanm
+sbc
+screenpresso
+sdx2_dpcm
 sgi # trivial
+sgirle # trivial
+shorten
+simbiosis_imx
+sipr
+siren
+smackaud
+smacker
+smc
+smvjpeg
+snow
+sol_dpcm
+sonic
+sp5x
+speedhq
+speex
+srgc
 srt # trivial
 ssa # trivial
+stl
+subrip
+subviewer
+subviewer1
 sunrast # trivial
+svq1
+svq3
+tak
 targa # trivial
+targa_y216
+tdsc
 text # trivial
 theora # libtheora
+thp
+tiertexseqvideo
 tiff # libtiff
+tmv
+truehd
+truemotion1
+truemotion2
+truemotion2rt
+truespeech
+tscc
+tscc2
+tta
+twinvq
+txd
+ulti
+utvideo
 v210 # trivial
 v210x # trivial
 v308 # trivial
 v408 # trivial
 v410 # trivial
+vb
+vble
+vcr1
+vmdaudio
+vmdvideo
+vmnc
 vorbis # libvorbis
 vp3 # libav
+vp4 # libav
 vp5 # libav
 vp6 # libav
 vp6a # libav
 vp6f # libav
+vp7 # libav
 vp8 # libvpx
 vp8_qsv # libvpx
 vp8_v4l2m2m # libvpx
 vp9 # libvpx
 vp9_qsv # libvpx
 vp9_v4l2m2m # libvpx
+vplayer
+vqa
+wavpack
+wcmv
 webp # libwebp
 webvtt # trivial
+wmav1
+wmav2
+wmavoice
+wmv1
+wmv2
+wnv1
 wrapped_avframe # passthrough
+ws_snd1
+xan_dpcm
+xan_wc3
+xan_wc4
+xbin
 xbm # trivial
+xface
+xl
+xpm
+xsub
 xwd # xwd
 y41p # trivial
+ylc
+yop
 yuv4 # trivial
+zero12v
+zerocodec
 zlib # zlib
+zmbv # dosbox

enable_encoders

@@ -1,20 +1,62 @@
 ## module name # reason for enablement in ffmpeg (usually there is another package that already got legal review)
+a64multi
+a64multi5
+aac
 libfdk_aac # fdk-aac-free
 ac3
+adpcm_adx
+adpcm_argo
+adpcm_g722
+adpcm_g726
+adpcm_g726le
+adpcm_ima_alp
+adpcm_ima_amv
+adpcm_ima_apm
+adpcm_ima_qt
+adpcm_ima_ssi
+adpcm_ima_wav
+adpcm_ima_ws
+adpcm_ms
+adpcm_swf
+adpcm_yamaha
+alac
+alias_pix
+amv
 apng # libpng
 ass # trivial
+asv1
+asv2
 ayuv # trival
+bitpacked # trivial
 bmp # trivial
+cinepak
+cljr
+dca
+dfpwm
+dnxhd
+dpx
+dvbsub
+dvdsub
+dvvideo
+exr
 ffv1
 ffvhuff # trivial+zlib
 flac # libFLAC
+flashsv
+flashsv2
+flv
+g723_1
 gif # libpng
+h261
+h263
 h263_v4l2m2m # hardware
+h263p
 h264_amf # hardware
 h264_nvenc # hardware
 h264_qsv # hardware
 h264_v4l2m2m # hardware
 h264_vaapi # hardware
+hap
 hevc_amf # hardware
 hevc_nvenc # hardware
 hevc_qsv # hardware
@@ -28,9 +70,11 @@ libaom # libaom
 libaom_av1 # libaom
 libcodec2 # codec2
 libgsm # libgsm
+libgsm_ms # libgsm
 libilbc # ilbc
 libjxl # libjxl
 libmp3lame # lame
+libopencore_amrnb
 libopenh264 # openh264_dlopen
 libopenjpeg # openjpeg
 libopus # opus
@@ -40,21 +84,29 @@ libspeex # speex
 libsvtav1
 libtheora # libtheora
 libtwolame # twolame
+libvo_amrwbenc
 libvorbis # libvorbis
 libvpx_vp8 # libvpx
 libvpx_vp9 # libvpx
 libwebp # libwebp
 libwebp_anim # libwebp
+libxvid # xvidcore
 mjpeg # mjpegtools
 mjpeg_qsv # mjpegtools
 mjpeg_vaapi # mjpegtools
+mlp
 mp2 # twolame
 mp2fixed # twolame
 mpeg1video
 mpeg2video
 mpeg2_qsv
 mpeg2_vaapi
+mpeg4
 mpeg4_v4l2m2m # hardware
+msmpeg4v2
+msmpeg4v3
+msvideo1
+nellymoser
 opus # opus
 pam
 pbm # trivial
@@ -86,32 +138,65 @@ pcm_u8 # trivial
 pcx
 pgm # trivial
 pgmyuv # trivial
+phm # trivial
 png # libpng
 ppm # trivial
+qoi
+qtrle
+r10k # trivial
+r210 # trivial
+ra_144
 rawvideo # trivial
+roq
+roq_dpcm
+rpza
+rv10
+rv20
+s302m
+sbc
 sgi # trivial
+smc
+snow
+sonic
+sonic_ls
+speedhq
 srt # trivial
 ssa # trivial
+subrip # trivial
 sunrast # trivial
+svq1
 targa # trivial
 text # trivial
 tiff # libtiff
+truehd
+tta
+ttml
+utvideo
 v210 # trivial
 v308 # trivial
 v408 # trivial
 v410 # trivial
 vc1_qsv # hardware
 vc1_v4l2m2m # hardware
+vc2 # dirac
 vorbis # libvorbis
 vp8_qsv # libvpx
 vp8_v4l2m2m # libvpx
 vp8_vaapi # libvpx
 vp9_qsv # libvpx
 vp9_vaapi # libvpx
+wavpack
 webvtt # trivial
+wmav1
+wmav2
+wmv1
+wmv2
 wrapped_avframe # passthrough
 xbm # (X11)
+xface
+xsub
 xwd # xwd
 y41p # trivial
 yuv4 # trivial
 zlib # zlib
+zmbv # dosbox

ffmpeg.spec

@@ -63,12 +63,10 @@
 %bcond_without rtmp
 %bcond_without x264
 %bcond_without x265
-%bcond_without xvid
 %else
 %bcond_with rtmp
 %bcond_with x264
 %bcond_with x265
-%bcond_with xvid
 %endif
 
 %if %{without lto}
@@ -93,7 +91,7 @@ Name:           ffmpeg
 %global pkg_name %{name}%{?pkg_suffix}
 
 Version:        5.1.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A complete solution to record, convert and stream audio and video
 License:        GPLv3+
 URL:            https://ffmpeg.org/
@@ -110,6 +108,7 @@ Source21:       enable_encoders
 Source90:       ffmpeg_update_free_sources.sh
 Source91:       ffmpeg_gen_free_tarball.sh
 Source92:       ffmpeg_get_dlopen_headers.sh
+Source93:       ffmpeg_find_free_source_headers.sh
 
 # Fixes for reduced codec selection on free build
 Patch1:         ffmpeg-codec-choice.patch
@@ -194,6 +193,7 @@ BuildRequires:  pkgconfig(lilv-0)
 BuildRequires:  pkgconfig(netcdf)
 BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(openal)
+BuildRequires:  pkgconfig(opencore-amrnb)
 BuildRequires:  pkgconfig(OpenCL)
 BuildRequires:  pkgconfig(opencv4)
 BuildRequires:  pkgconfig(opus)
@@ -214,6 +214,7 @@ BuildRequires:  pkgconfig(vapoursynth)
 BuildRequires:  pkgconfig(vdpau)
 BuildRequires:  pkgconfig(vidstab)
 BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(vo-amrwbenc)
 BuildRequires:  pkgconfig(vpx)
 BuildRequires:  pkgconfig(vulkan)
 BuildRequires:  pkgconfig(wavpack)
@@ -226,11 +227,8 @@ BuildRequires:  pkgconfig(zimg)
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(zvbi-0.2)
 BuildRequires:  texinfo
+BuildRequires:  xvidcore-devel
 
-%if %{with amr}
-BuildRequires:  pkgconfig(opencore-amrnb)
-BuildRequires:  pkgconfig(vo-amrwbenc)
-%endif
 %if %{with dc1394}
 BuildRequires:  pkgconfig(libavc1394)
 BuildRequires:  pkgconfig(libdc1394-2)
@@ -254,9 +252,6 @@ BuildRequires:  pkgconfig(x265)
 %if %{with vmaf}
 BuildRequires:  pkgconfig(libvmaf)
 %endif
-%if %{with xvid}
-BuildRequires:  xvidcore-devel
-%endif
 
 
 %description
@@ -639,11 +634,9 @@ cp -a doc/examples/{*.c,Makefile,README} _doc/examples/
 %endif
     --enable-vaapi \
     --enable-vdpau \
-%if %{with amr}
     --enable-libopencore-amrnb \
     --enable-libopencore-amrwb \
     --enable-libvo-amrwbenc \
-%endif
 %if %{with x264}
     --enable-libx264 \
 %endif
@@ -653,9 +646,7 @@ cp -a doc/examples/{*.c,Makefile,README} _doc/examples/
 %if %{with librtmp}
     --enable-librtmp \
 %endif
-%if %{with xvid}
     --enable-libxvid \
-%endif
     --enable-openal \
     --enable-opencl \
     --enable-opengl \
@@ -667,7 +658,7 @@ cp -a doc/examples/{*.c,Makefile,README} _doc/examples/
     --enable-hwaccels \
     --disable-encoders \
     --disable-decoders \
-    --disable-decoder="mpeg4,h263,h264,hevc,vc1" \
+    --disable-decoder="h264,hevc,vc1" \
     --enable-encoder="$(perl -pe 's{^(\w*).*}{$1,}gs' <enable_encoders)" \
     --enable-decoder="$(perl -pe 's{^(\w*).*}{$1,}gs' <enable_decoders)" \
 %endif
@@ -708,12 +699,12 @@ cat config_components.h
 # Paranoia check
 %if %{without all_codecs}
 # DECODER
-for i in MPEG4 H263 H264 HEVC HEVC_RKMPP VC1; do
+for i in H264 HEVC HEVC_RKMPP VC1; do
     grep -q "#define CONFIG_${i}_DECODER 0" config_components.h
 done
 
 # ENCODER
-for i in MPEG4 H263 H263P LIBX264 LIBX264RGB LIBX265 LIBXVID; do
+for i in LIBX264 LIBX264RGB LIBX265; do
     grep -q "#define CONFIG_${i}_ENCODER 0" config_components.h
 done
 for i in H264 HEVC; do
@@ -836,6 +827,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
 %{_mandir}/man3/libswscale.3*
 
 %changelog
+* Mon Jan 30 2023 Neal Gompa <ngompa@fedoraproject.org> - 5.1.2-6
+- Enable more approved codecs
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

ffmpeg_find_free_source_headers.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# Script to identify trivial new headers for new sources added
+# Requires: bash, coreutils, tar, xz
+# Author: Neal Gompa <ngompa@fedoraproject.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+FFMPEG_VERSION=$1
+FF_SRC_DIFF=$2
+
+if [ -z $1 -o -z $2 ]; then
+	echo "No arguments provided, quitting!"
+	exit 1
+fi
+
+echo "Setting up..."
+# Get local directory
+LOCALDIR=$(realpath $(dirname $0))
+
+# Create working area
+TMPDIR=$(mktemp -d /tmp/ffsrchdrsXXXXXX)
+mkdir -pv $TMPDIR
+
+# Extract ffmpeg sources
+if [ ! -f "ffmpeg-${FFMPEG_VERSION}.tar.xz" ]; then
+	echo "No ffmpeg tarball, exiting!"
+	exit 2
+fi
+if [ ! -f "$FF_SRC_DIFF" ]; then
+	echo "No ffmpeg sources diff, exiting!"
+	exit 2
+fi
+echo "Extracting upstream ffmpeg sources..."
+tar -C ${TMPDIR} -xf ffmpeg-${FFMPEG_VERSION}.tar.xz
+
+echo "Generating header list from diff..."
+# Read in ffmpeg_free_sources diff
+while IFS= read -r line
+do
+	if [[ $line = \+* ]]; then
+		ffmpeg_src_file="${line:1}"
+		if [ -f "${TMPDIR}/ffmpeg-${FFMPEG_VERSION}/${ffmpeg_src_file}" ]; then
+			ffmpeg_hdr_file="${ffmpeg_src_file%.c}.h"
+			[ -f "${TMPDIR}/ffmpeg-${FFMPEG_VERSION}/${ffmpeg_hdr_file}" ] && echo "${ffmpeg_hdr_file}" >> ${LOCALDIR}/ffmpeg_free_sources
+			ffmpeg_hdr_file="${ffmpeg_src_file%.c}_cb.h"
+			[ -f "${TMPDIR}/ffmpeg-${FFMPEG_VERSION}/${ffmpeg_hdr_file}" ] && echo "${ffmpeg_hdr_file}" >> ${LOCALDIR}/ffmpeg_free_sources
+			ffmpeg_hdr_file="${ffmpeg_src_file%.c}data.h"
+			[ -f "${TMPDIR}/ffmpeg-${FFMPEG_VERSION}/${ffmpeg_hdr_file}" ] && echo "${ffmpeg_hdr_file}" >> ${LOCALDIR}/ffmpeg_free_sources
+			ffmpeg_hdr_file="${ffmpeg_src_file%.c}_data.h"
+			[ -f "${TMPDIR}/ffmpeg-${FFMPEG_VERSION}/${ffmpeg_hdr_file}" ] && echo "${ffmpeg_hdr_file}" >> ${LOCALDIR}/ffmpeg_free_sources
+			ffmpeg_hdr_file="${ffmpeg_src_file%.c}_tablegen.h"
+			[ -f "${TMPDIR}/ffmpeg-${FFMPEG_VERSION}/${ffmpeg_hdr_file}" ] && echo "${ffmpeg_hdr_file}" >> ${LOCALDIR}/ffmpeg_free_sources
+		fi
+	fi
+done < <(cat $FF_SRC_DIFF)
+
+# Clean up
+echo "Clean up workspace..."
+rm -rf ${TMPDIR}

sources

@@ -1,4 +1,4 @@
-SHA512 (ffmpeg-free-5.1.2.tar.xz) = ed718699a4b134942985741dab9d3fc14490c0e3035d90b64710a3be9e1df0f542cd6e618dde3d3a951201a2e17e5135e7f4c631cc781b1627e798532ca74800
+SHA512 (ffmpeg-free-5.1.2.tar.xz) = 91c4d86801cbd5dc69cb12b795bf36ff9a5e3d5d78a65e3d3efb65f24491587ec0605d4c54e326ef389945fc904da9073ad8406ef6937408b8d0f816792df678
 SHA512 (ffmpeg-5.1.2.tar.xz.asc) = 6afc898e3898a7d34e21f0f0bd0553765a46257332c6ece6226e3e043b842275a8d885b9ccca34bc90a2f008ae5fa14515276d23f921a518a63a47f6504af115
 SHA512 (ffmpeg-dlopen-headers.tar.xz) = 97e6986fc2bb9dfa4516135a76b04d27ceb52ff96f0af21a6169919aeefefb4d2e2e24a771959689cdbec385f5d71614ba661223c67c0e94089a6dd823a30099
 SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165