Accepting request 1131456 from multimedia:libs

- Copy codec list from ffmpeg-6

OBS-URL: https://build.opensuse.org/request/show/1131456
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-4?expand=0&rev=61

enable_decoders

@@ -1,27 +1,210 @@
 ## module name # reason for enablement in ffmpeg (usually there is another package that already got legal review)
 aac
+aasc
 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_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_xmd
+adpcm_yamaha
+adpcm_zork
+alac
+alias_pix
+amrnb # opencore-amr
+amrwb # opencore-amr
+amv
+anm
 ansi # trivial
-apng
+anull
+apac
+ape
+apng # animated png
+arbc
+argo
 ass # trivial
+asv1
+asv2
+atrac1
+atrac3
+atrac3al
+atrac3p
+atrac3pal
+aura
+aura2
+av1 # libaom
+av1_nvdec # passthrough
+av1_qsv # passthrough
+av1_vaapi # passthrough
 ayuv # trivial
+bethsoftvid # trivial
+bfi # trivial
+bink
+binkaudio_dct
+binkaudio_rdft
+bintext
+bitpacked # trivial
 bmp # trivial
+bmv_audio
+bmv_video
+bonk
+brender_pix
+c93
+cbd2_dpcm
+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
+ftr # fdk-aac
+g723_1
+g729
+gdv
+gem
 gif # libpng
+gremlin_dpcm
 gsm # libgsm
+gsm_ms
+h261
+h263
+h263_v4l2m2m # passthrough
+h263i
+h263p
+hap
+hca
+hcom
+hdr
+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
-libcelt # celt, opus
 libcodec2 # codec2
 libdav1d # av1
 libgsm # libgsm
+libgsm_ms # libgsm
+libjxl # libjxl
+libopencore_amrnb # opencore-amr
+libopencore_amrwb # opencore-amr
+libopenh264 # passthrough/dlopen
 libopenjpeg # openjpeg
 libopus # opus
 libschroedinger # schroedinger
@@ -29,39 +212,105 @@ libspeex # speex
 libvorbis # libvorbis
 libvpx_vp8 # libvpx
 libvpx_vp9 # libvpx
+libzvbi_teletext # zvbi
+loco
+lscr
+m101
+mace3
+mace6
+mdec
+media100
+metasound
+microdvd
+mimic
+misc4
 mjpeg # mjpegtools
+mjpeg_qsv # passthrough
+mjpegb
+mlp
+mmvideo
+motionpixels
 mp1 # twolame/lame
 mp1float # twolame/lame
 mp2 # twolame
 mp2float # twolame
 mp3 # lame
+mp3adu
+mp3adufloat
 mp3float # lame
+mp3on4
+mp3on4float
+mpc7
+mpc8
+mpeg1_cuvid # passthrough
+mpeg1_v4l2m2m # passthrough
 mpeg1video
+mpeg2_cuvid # passthrough
+mpeg2_qsv # passthrough
+mpeg2_v4l2m2m # passthrough
+mpeg2_vaapi # passthrough
 mpeg2video
-#mpeg4
+mpeg4
-opus # libopus
+mpeg4_cuvid # passthrough
+mpeg4_v4l2m2m # passthrough
+mpegvideo
+mpl2
+msa1
+mscc
+msmpeg4
+msmpeg4v1
+msmpeg4v2
+msmpeg4v3
+msnsiren
+msp2
+msrle
+mss1
+msvideo1
+mszh
+mts2
+mv30
+mvc1
+mvc2
+mvdv
+mvha
+mwsc
+mxpeg
+nellymoser
+nuv
+on2avc
+opus # opus
+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_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
@@ -69,39 +318,163 @@ 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
+rka
+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 # 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
+vnull # trivial
 vorbis # libvorbis
 vp3 # libav
+vp4 # libav
+vp5 # libav
 vp5 # libav
 vp6 # libav
+vp6 # libav
+vp6a # libav
 vp6a # libav
 vp6f # libav
+vp6f # libav
+vp7 # libav
 vp8 # libvpx
+vp8_qsv # passthrough
+vp8_v4l2m2m # passthrough
 vp9 # libvpx
+vp9_qsv # passthrough
+vp9_v4l2m2m # passthrough
+vplayer
+vqa
+vqc
+wady_dpcm
+wavarc
+wavpack # wavpack
+wbmp
+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
+y41p # trivial
+ylc
+yop
 yuv4 # trivial
+yuv4 # trivial
+zero12v
+zerocodec
 zlib # zlib
+zmbv # dosbox

enable_encoders

@@ -1,38 +1,104 @@
 ## module name # reason for enablement in ffmpeg (usually there is another package that already got legal review)
+a64multi
+a64multi5
 aac
+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
+anull
 apng # libpng
 ass # trivial
+asv1
+asv2
+av1_nvenc
+av1_vaapi
 ayuv # trival
+bitpacked # trivial
 bmp # trivial
+cinepak
+cljr
+dca
+dfpwm
+dnxhd
+dpx
+dvdsub
+dvvideo
+exr
 ffv1
 ffvhuff # trivial+zlib
 flac # libFLAC
+flashsv
+flashsv2
+flv
+g723_1
 gif # libpng
+h261
+h263
+h263_v4l2m2m # passthrough
+h263p
+hdr
 huffyuv # trivial+zlib
+ilbc # ilbc
+jpeg2000
 jpegls
 libaom # libaom
 libaom_av1 # libaom
 libcodec2 # codec2
 libgsm # libgsm
+libgsm_ms # libgsm
+libjxl # libjxl
 libmp3lame # lame
+libopencore_amrnb # opencore-amr
+libopenh264 # passthrough/dlopen
 libopenjpeg # openjpeg
 libopus # opus
 librav1e # rav1e
 libschroedinger # schroedinger
 libspeex # speex
-libsvtav1
+libsvtav1 # SVT-AV1
 libtheora # libtheora
 libtwolame # twolame
+libvo_amrwbenc # vo-amrwbenc
 libvorbis # libvorbis
-libvpx_vp8
+libvpx_vp8 # libvpx
-libvpx_vp9
+libvpx_vp9 # libvpx
-libwebp
+libwebp # libwebp
-libwebp_anim
+libwebp_anim # libwebp
+libxvid # xvidcore
 mjpeg # mjpegtools
+mjpeg_qsv # passthrough
+mjpeg_vaapi # passthrough
+mlp
 mp2 # twolame
 mp2fixed # twolame
 mpeg1video
+mpeg2_qsv
+mpeg2_vaapi
 mpeg2video
+mpeg4
+mpeg4_v4l2m2m # passthrough
+msmpeg4v1
+msmpeg4v2
+msmpeg4v3
+msnsiren
+msvideo1
+nellymoser
 opus # opus
 pam
 pbm # trivial
@@ -64,25 +130,66 @@ 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
+siren
+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
+vc2 # dirac
+vnull # trivial
 vorbis # libvorbis
+vp8_qsv # passthrough
+vp8_v4l2m2m # passthrough
+vp8_vaapi # passthrough
+vp9_qsv # passthrough
+vp9_vaapi # passthough
+wavpack
+wbmp
 webvtt # trivial
+wmav1
+wmav2
+wmv1
+wmv2
 wrapped_avframe # passthrough
-xbm # (X11)
+xbm # trivial
+xface
+xsub
 xwd # xwd
 y41p # trivial
 yuv4 # trivial
 zlib # zlib
+zmbv # dosbox

ffmpeg-4.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec  6 08:50:00 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Copy codec list from ffmpeg-6
+
 -------------------------------------------------------------------
 Mon Oct 30 11:16:43 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 

ffmpeg-4.spec

@@ -69,6 +69,9 @@
 %bcond_without soxr
 %bcond_without zmq
 %bcond_without vulkan
+%bcond_without amrwb
+%bcond_without opencore
+%bcond_without xvid
 %else
 %bcond_with libaom
 %bcond_with mysofa
@@ -752,11 +755,11 @@ LDFLAGS="%_lto_cflags" \
 	--enable-demuxers \
 	--disable-encoders \
 	--disable-decoders \
-	--disable-decoder=mpeg4,h263,h264,hevc,vc1 \
+	--disable-decoder=h264,hevc,vc1 \
 	--enable-encoder="$(perl -pe 's{^(\w*).*}{$1,}gs' <%_sourcedir/enable_encoders)" \
 	--enable-decoder="$(perl -pe 's{^(\w*).*}{$1,}gs' <%_sourcedir/enable_decoders)" \
 
-for i in MPEG4 H263 H264 HEVC VC1; do
+for i in H264 HEVC VC1; do
 	grep -q "#define CONFIG_${i}_DECODER 0" config.h
 done
 %endif