Accepting request 1138974 from home:iDesmI:Wayland

- Update to version 6.1.1:
  * libaribcaption decoder
  * Playdate video decoder and demuxer
  * Extend VAAPI support for libva-win32 on Windows
  * afireqsrc audio source filter
  * arls filter
  * ffmpeg CLI new option: -readrate_initial_burst
  * zoneplate video source filter
  * command support in the setpts and asetpts filters
  * Vulkan decode hwaccel, supporting H264, HEVC and AV1
  * color_vulkan filter
  * bwdif_vulkan filter
  * nlmeans_vulkan filter
  * RivaTuner video decoder
  * xfade_vulkan filter
  * vMix video decoder
  * Essential Video Coding parser, muxer and demuxer
  * Essential Video Coding frame merge bsf
  * bwdif_cuda filter
  * Microsoft RLE video encoder
  * Raw AC-4 muxer and demuxer
  * Raw VVC bitstream parser, muxer and demuxer
  * Bitstream filter for editing metadata in VVC streams
  * Bitstream filter for converting VVC from MP4 to Annex B
  * scale_vt filter for videotoolbox
  * transpose_vt filter for videotoolbox
  * support for the P_SKIP hinting to speed up libx264 encoding
  * Support HEVC,VP9,AV1 codec in enhanced flv format
  * apsnr and asisdr audio filters
  * OSQ demuxer and decoder
  * Support HEVC,VP9,AV1 codec fourcclist in enhanced rtmp protocol
  * CRI USM demuxer
  * ffmpeg CLI '-top' option deprecated in favor of the setfield filter
  * VAAPI AV1 encoder
  * ffprobe XML output schema changed to account for multiple variable-fields elements within the same parent element
  * ffprobe -output_format option added as an alias of -of
- Remove patch6 0001-avfilter-vf_libplacebo-remove-deprecated-field.diff
- Prefer libvpl to libmfx: the latter is deprecated
- Delete ffmpeg-6-private-devel package as it is only needed to build libav-tools
- Remove patch2 ffmpeg-new-coder-errors.diff

OBS-URL: https://build.opensuse.org/request/show/1138974
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-6?expand=0&rev=20

ffmpeg-4.2-dlopen-fdk_aac.patch

@@ -12,11 +12,11 @@ fdkaac/lame/x264/x265.
  libavcodec/libfdk-aacenc.c |   47 +++++++++++++++++++++++++++++++++++++++
  4 files changed, 115 insertions(+)
 
-Index: ffmpeg-5.1/configure
+Index: ffmpeg-6.1.1/configure
 ===================================================================
---- ffmpeg-5.1.orig/configure
-+++ ffmpeg-5.1/configure
-@@ -231,6 +231,7 @@ External library support:
+--- ffmpeg-6.1.1.orig/configure
++++ ffmpeg-6.1.1/configure
+@@ -228,6 +228,7 @@ External library support:
    --enable-libdc1394       enable IIDC-1394 grabbing using libdc1394
                             and libraw1394 [no]
    --enable-libfdk-aac      enable AAC de/encoding via libfdk-aac [no]
@@ -24,7 +24,7 @@ Index: ffmpeg-5.1/configure
    --enable-libflite        enable flite (voice synthesis) support via libflite [no]
    --enable-libfontconfig   enable libfontconfig, useful for drawtext filter [no]
    --enable-libfreetype     enable libfreetype, needed for drawtext filter [no]
-@@ -1787,6 +1788,7 @@ EXTERNAL_LIBRARY_GPL_LIST="
+@@ -1812,6 +1813,7 @@ EXTERNAL_LIBRARY_GPL_LIST="
  EXTERNAL_LIBRARY_NONFREE_LIST="
      decklink
      libfdk_aac
@@ -32,7 +32,7 @@ Index: ffmpeg-5.1/configure
      libtls
  "
  
-@@ -6544,6 +6546,7 @@ enabled libdrm            && require_pkg
+@@ -6697,6 +6699,7 @@ enabled libdrm            && require_pkg
  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 &&
                                   warn "using libfdk without pkg-config"; } }
@@ -40,10 +40,10 @@ Index: ffmpeg-5.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"
  enabled libflite          && require libflite "flite/flite.h" flite_init $flite_extralibs
  enabled fontconfig        && enable libfontconfig
-Index: ffmpeg-5.1/libavcodec/dlopen.h
+Index: ffmpeg-6.1.1/libavcodec/dlopen.h
 ===================================================================
 --- /dev/null
-+++ ffmpeg-5.1/libavcodec/dlopen.h
++++ ffmpeg-6.1.1/libavcodec/dlopen.h
 @@ -0,0 +1,12 @@
 +#ifndef LOCALINC_DLOPEN_H
 +#define LOCALINC_DLOPEN_H
@@ -57,10 +57,10 @@ Index: ffmpeg-5.1/libavcodec/dlopen.h
 +		goto error;
 +
 +#endif
-Index: ffmpeg-5.1/libavcodec/libfdk-aacdec.c
+Index: ffmpeg-6.1.1/libavcodec/libfdk-aacdec.c
 ===================================================================
---- ffmpeg-5.1.orig/libavcodec/libfdk-aacdec.c
-+++ ffmpeg-5.1/libavcodec/libfdk-aacdec.c
+--- ffmpeg-6.1.1.orig/libavcodec/libfdk-aacdec.c
++++ ffmpeg-6.1.1/libavcodec/libfdk-aacdec.c
 @@ -38,6 +38,54 @@
  #define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS
  #endif
@@ -128,11 +128,11 @@ Index: ffmpeg-5.1/libavcodec/libfdk-aacdec.c
      s->handle = aacDecoder_Open(avctx->extradata_size ? TT_MP4_RAW : TT_MP4_ADTS, 1);
      if (!s->handle) {
          av_log(avctx, AV_LOG_ERROR, "Error opening decoder\n");
-Index: ffmpeg-5.1/libavcodec/libfdk-aacenc.c
+Index: ffmpeg-6.1.1/libavcodec/libfdk-aacenc.c
 ===================================================================
---- ffmpeg-5.1.orig/libavcodec/libfdk-aacenc.c
-+++ ffmpeg-5.1/libavcodec/libfdk-aacenc.c
-@@ -36,6 +36,48 @@
+--- ffmpeg-6.1.1.orig/libavcodec/libfdk-aacenc.c
++++ ffmpeg-6.1.1/libavcodec/libfdk-aacenc.c
+@@ -37,6 +37,48 @@
  #define FDKENC_VER_AT_LEAST(vl0, vl1) 0
  #endif
  
@@ -181,8 +181,8 @@ Index: ffmpeg-5.1/libavcodec/libfdk-aacenc.c
  typedef struct AACContext {
      const AVClass *class;
      HANDLE_AACENCODER handle;
-@@ -128,6 +170,11 @@ static av_cold int aac_encode_init(AVCod
-     int aot = FF_PROFILE_AAC_LOW + 1;
+@@ -182,6 +224,11 @@ static av_cold int aac_encode_init(AVCod
+     int aot = AV_PROFILE_AAC_LOW + 1;
      int sce = 0, cpe = 0;
  
 +#ifdef CONFIG_LIBFDK_AAC_DLOPEN