Merge remote-tracking branch 'upstream/master'

Author: Sibras

Changelog

@@ -20,6 +20,7 @@ version <next>:
 - MSN Siren decoder
 - scharr video filter
 - apsyclip audio filter
+- morpho video filter
 
 
 version 4.4:

compat/w32dlfcn.h

@@ -42,7 +42,7 @@ static inline HMODULE win32_dlopen(const char *name)
         DWORD pathlen;
         if (utf8towchar(name, &name_w))
             goto exit;
-        path = (wchar_t *)av_mallocz_array(MAX_PATH, sizeof(wchar_t));
+        path = (wchar_t *)av_calloc(MAX_PATH, sizeof(wchar_t));
         // Try local directory first
         pathlen = GetModuleFileNameW(NULL, path, MAX_PATH);
         pathlen = wcsrchr(path, '\\') - path;

configure

@@ -1765,7 +1765,6 @@ EXTERNAL_LIBRARY_GPL_LIST="
 EXTERNAL_LIBRARY_NONFREE_LIST="
     decklink
     libfdk_aac
-    openssl
     libtls
 "
 
@@ -1857,6 +1856,7 @@ EXTERNAL_LIBRARY_LIST="
     mediacodec
     openal
     opengl
+    openssl
     pocketsphinx
     vapoursynth
 "
@@ -3597,8 +3597,9 @@ firequalizer_filter_select="rdft"
 flite_filter_deps="libflite"
 framerate_filter_select="scene_sad"
 freezedetect_filter_select="scene_sad"
-frei0r_filter_deps="frei0r libdl"
-frei0r_src_filter_deps="frei0r libdl"
+frei0r_deps_any="libdl LoadLibrary"
+frei0r_filter_deps="frei0r"
+frei0r_src_filter_deps="frei0r"
 fspp_filter_deps="gpl"
 histeq_filter_deps="gpl"
 hqdn3d_filter_deps="gpl"
@@ -3725,7 +3726,6 @@ cws2fws_extralibs="zlib_extralibs"
 # libraries, in any order
 avcodec_deps="avutil"
 avcodec_suggest="libm"
-avcodec_select="null_bsf"
 avdevice_deps="avformat avcodec avutil"
 avdevice_suggest="libm"
 avfilter_deps="avutil"
@@ -5009,9 +5009,11 @@ elif enabled arm; then
         fi
     }
 
-    [ "$cpu" = generic ] && cpu=$(probe_arm_arch)
 
     case $cpu in
+        generic)
+            subarch=$(probe_arm_arch | sed 's/[^a-z0-9]//g')
+        ;;
         armv*)
             cpuflags="-march=$cpu"
             subarch=$(echo $cpu | sed 's/[^a-z0-9]//g')
@@ -6384,7 +6386,7 @@ enabled cuda_nvcc         && { check_nvcc cuda_nvcc || die "ERROR: failed checki
 enabled chromaprint       && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint
 enabled decklink          && { require_headers DeckLinkAPI.h &&
                                { test_cpp_condition DeckLinkAPIVersion.h "BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a0b0000" || die "ERROR: Decklink API version must be >= 10.11"; } }
-enabled frei0r            && require_headers "frei0r.h dlfcn.h"
+enabled frei0r            && require_headers "frei0r.h"
 enabled gmp               && require gmp gmp.h mpz_export -lgmp
 enabled gnutls            && require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init
 enabled jni               && { [ $target_os = "android" ] && check_headers jni.h && enabled pthreads || die "ERROR: jni not found"; }
@@ -6573,7 +6575,10 @@ enabled omx_rpi           && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoR
                                die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } &&
                              enable omx
 enabled omx               && require_headers OMX_Core.h
-enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
+enabled openssl           && { { check_pkg_config openssl "openssl >= 3.0.0" openssl/ssl.h OPENSSL_init_ssl &&
+                                 { enabled gplv3 || ! enabled gpl || enabled nonfree || die "ERROR: OpenSSL >=3.0.0 requires --enable-version3"; }; } ||
+                               { enabled gpl && ! enabled nonfree && die "ERROR: OpenSSL <3.0.0 is incompatible with the gpl"; } ||
+                               check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
                                check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
                                check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||

doc/APIchanges

@@ -14,6 +14,24 @@ libavutil:     2021-04-27
 
 API changes, most recent first:
 
+2021-09-21 - xxxxxxxxxx - lavu 57.7.100 - pixfmt.h
+  Add AV_PIX_FMT_X2BGR10.
+
+2021-09-20 - xxxxxxxxxx - lavu 57.6.100 - mem.h
+  Deprecate av_mallocz_array() as it is identical to av_calloc().
+
+2021-09-20 - xxxxxxxxxx - lavc 59.9.100 - avcodec.h
+  Deprecate AVCodecContext.sub_text_format and the corresponding
+  AVOptions. It is unused since the last major bump.
+
+2021-09-20 - xxxxxxxxxx - lavc 59.8.100 - avcodec.h codec.h
+  Deprecate AV_CODEC_FLAG_TRUNCATED and AV_CODEC_CAP_TRUNCATED,
+  as they are redundant with parsers.
+
+2021-09-17 - xxxxxxxxxx - lavu 57.5.101 - buffer.h
+  Constified the input parameters in av_buffer_replace(), av_buffer_ref(),
+  and av_buffer_pool_buffer_get_opaque().
+
 2021-09-08 - xxxxxxxxxx - lavu 57.5.100 - hwcontext_d3d11va.h
   Add AVD3D11VAFramesContext.texture_infos
 

doc/decoders.texi

@@ -76,13 +76,19 @@ The following options are supported by the libdav1d wrapper.
 
 @item framethreads
 Set amount of frame threads to use during decoding. The default value is 0 (autodetect).
+This option is deprecated for libdav1d >= 1.0 and will be removed in the future. Use the
+global option @code{threads} instead.
 
 @item tilethreads
 Set amount of tile threads to use during decoding. The default value is 0 (autodetect).
+This option is deprecated for libdav1d >= 1.0 and will be removed in the future. Use the
+global option @code{threads} instead.
 
 @item filmgrain
 Apply film grain to the decoded video if present in the bitstream. Defaults to the
 internal default of the library.
+This option is deprecated and will be removed in the future. See the global option
+@code{export_side_data} to export Film Grain parameters instead of applying it.
 
 @item oppoint
 Select an operating point of a scalable AV1 bitstream (0 - 31). Defaults to the

doc/demuxers.texi

@@ -150,6 +150,12 @@ directive) will be reduced based on their specified Out point.
 Metadata of the packets of the file. The specified metadata will be set for
 each file packet. You can specify this directive multiple times to add multiple
 metadata entries.
+This directive is deprecated, use @code{file_packet_meta} instead.
+
+@item @code{file_packet_meta @var{key} @var{value}}
+Metadata of the packets of the file. The specified metadata will be set for
+each file packet. You can specify this directive multiple times to add multiple
+metadata entries.
 
 @item @code{option @var{key} @var{value}}
 Option to access, open and probe the file.
@@ -171,6 +177,20 @@ subfiles will be used.
 This is especially useful for MPEG-PS (VOB) files, where the order of the
 streams is not reliable.
 
+@item @code{stream_meta @var{key} @var{value}}
+Metadata for the stream.
+Can be present multiple times.
+
+@item @code{stream_codec @var{value}}
+Codec for the stream.
+
+@item @code{stream_extradata @var{hex_string}}
+Extradata for the string, encoded in hexadecimal.
+
+@item @code{chapter @var{id} @var{start} @var{end}}
+Add a chapter. @var{id} is an unique identifier, possibly small and
+consecutive.
+
 @end table
 
 @subsection Options

doc/encoders.texi

@@ -1750,12 +1750,30 @@ You need to explicitly configure the build with @code{--enable-libsvtav1}.
 @table @option
 @item profile
 Set the encoding profile.
+@table @samp
+@item main
+@item high
+@item professional
+@end table
 
 @item level
-Set the operating point level.
+Set the operating point level. For example: '4.0'
+
+@item hielevel
+Set the Hierarchical prediction levels.
+@table @samp
+@item 3level
+@item 4level
+This is the default.
+@end table
 
 @item tier
 Set the operating point tier.
+@table @samp
+@item main
+This is the default.
+@item high
+@end table
 
 @item rc
 Set the rate control mode to use.

doc/examples/remuxing.c

@@ -85,7 +85,7 @@ int main(int argc, char **argv)
     }
 
     stream_mapping_size = ifmt_ctx->nb_streams;
-    stream_mapping = av_mallocz_array(stream_mapping_size, sizeof(*stream_mapping));
+    stream_mapping = av_calloc(stream_mapping_size, sizeof(*stream_mapping));
     if (!stream_mapping) {
         ret = AVERROR(ENOMEM);
         goto end;

doc/examples/transcoding.c

@@ -72,7 +72,7 @@ static int open_input_file(const char *filename)
         return ret;
     }
 
-    stream_ctx = av_mallocz_array(ifmt_ctx->nb_streams, sizeof(*stream_ctx));
+    stream_ctx = av_calloc(ifmt_ctx->nb_streams, sizeof(*stream_ctx));
     if (!stream_ctx)
         return AVERROR(ENOMEM);
 

doc/ffprobe.xsd

@@ -269,10 +269,6 @@
       <xsd:attribute name="program_id"           type="xsd:int"    use="required"/>
       <xsd:attribute name="program_num"          type="xsd:int"    use="required"/>
       <xsd:attribute name="nb_streams"           type="xsd:int"    use="required"/>
-      <xsd:attribute name="start_time"           type="xsd:float"/>
-      <xsd:attribute name="start_pts"            type="xsd:long"/>
-      <xsd:attribute name="end_time"             type="xsd:float"/>
-      <xsd:attribute name="end_pts"              type="xsd:long"/>
       <xsd:attribute name="pmt_pid"              type="xsd:int"    use="required"/>
       <xsd:attribute name="pcr_pid"              type="xsd:int"    use="required"/>
     </xsd:complexType>