Merge remote-tracking branch 'upstream/master'

Author: Sibras

.mailmap

@@ -10,7 +10,8 @@
 <barryjzhao@tencent.com> <jun.zhao@intel.com>
 <josh@itanimul.li> <joshdk@obe.tv>
 <michael@niedermayer.cc> <michaelni@gmx.at>
-<linjie.fu@intel.com> <fulinjie@zju.edu.cn>
+<linjie.justin.fu@gmail.com> <linjie.fu@intel.com>
+<linjie.justin.fu@gmail.com> <fulinjie@zju.edu.cn>
 <ceffmpeg@gmail.com> <cehoyos@ag.or.at>
 <ceffmpeg@gmail.com> <cehoyos@rainbow.studorg.tuwien.ac.at>
 <ffmpeg@gyani.pro> <gyandoshi@gmail.com>

Changelog

@@ -77,6 +77,12 @@ version <next>:
 - OpenEXR image encoder
 - Simbiosis IMX decoder
 - Simbiosis IMX demuxer
+- Digital Pictures SGA demuxer and decoders
+- TTML subtitle encoder and muxer
+- identity video filter
+- msad video filter
+- gophers protocol
+- RIST protocol via librist
 
 
 version 4.3:

MAINTAINERS

@@ -138,6 +138,7 @@ Codecs:
   8bps.c                                Roberto Togni
   8svx.c                                Jaikrishnan Menon
   aacenc*, aaccoder.c                   Rostislav Pehlivanov
+  adpcm.c                               Zane van Iperen
   alacenc.c                             Jaikrishnan Menon
   alsdec.c                              Thilo Borgmann, Umair Khan
   aptx.c                                Aurelien Jacobs

Makefile

@@ -110,7 +110,7 @@ include $(SRC_PATH)/fftools/Makefile
 include $(SRC_PATH)/doc/Makefile
 include $(SRC_PATH)/doc/examples/Makefile
 
-libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h
+libavcodec/avcodec.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h
 
 $(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF)
 ifeq ($(STRIPTYPE),direct)

RELEASE

@@ -1 +1 @@
-4.3.git
+4.4.git

configure

@@ -259,6 +259,7 @@ External library support:
   --enable-libpulse        enable Pulseaudio input via libpulse [no]
   --enable-librabbitmq     enable RabbitMQ library [no]
   --enable-librav1e        enable AV1 encoding via rav1e [no]
+  --enable-librist         enable RIST via librist [no]
   --enable-librsvg         enable SVG rasterization via librsvg [no]
   --enable-librubberband   enable rubberband needed for rubberband filter [no]
   --enable-librtmp         enable RTMP[E] support via librtmp [no]
@@ -1797,6 +1798,7 @@ EXTERNAL_LIBRARY_LIST="
     libpulse
     librabbitmq
     librav1e
+    librist
     librsvg
     librtmp
     libshine
@@ -2288,6 +2290,7 @@ TOOLCHAIN_FEATURES="
 
 TYPES_LIST="
     kCMVideoCodecType_HEVC
+    kCMVideoCodecType_HEVCWithAlpha
     kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange
     kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ
     kCVImageBufferTransferFunction_ITU_R_2100_HLG
@@ -3361,6 +3364,7 @@ opus_muxer_select="ogg_muxer"
 psp_muxer_select="mov_muxer"
 rtp_demuxer_select="sdp_demuxer"
 rtp_muxer_select="golomb jpegtables"
+rtp_mpegts_muxer_select="mpegts_muxer rtp_muxer"
 rtpdec_select="asf_demuxer jpegtables mov_demuxer mpegts_demuxer rm_demuxer rtp_protocol srtp"
 rtsp_demuxer_select="http_protocol rtpdec"
 rtsp_muxer_select="rtp_muxer http_protocol rtp_protocol rtpenc_chain"
@@ -3449,7 +3453,8 @@ ffrtmpcrypt_protocol_select="tcp_protocol"
 ffrtmphttp_protocol_conflict="librtmp_protocol"
 ffrtmphttp_protocol_select="http_protocol"
 ftp_protocol_select="tcp_protocol"
-gopher_protocol_select="network"
+gopher_protocol_select="tcp_protocol"
+gophers_protocol_select="tls_protocol"
 http_protocol_select="tcp_protocol"
 http_protocol_suggest="zlib"
 httpproxy_protocol_select="tcp_protocol"
@@ -3490,6 +3495,8 @@ unix_protocol_select="network"
 # external library protocols
 libamqp_protocol_deps="librabbitmq"
 libamqp_protocol_select="network"
+librist_protocol_deps="librist"
+librist_protocol_select="network"
 librtmp_protocol_deps="librtmp"
 librtmpe_protocol_deps="librtmp"
 librtmps_protocol_deps="librtmp"
@@ -6210,6 +6217,7 @@ enabled avfoundation && {
 enabled videotoolbox && {
     check_lib coreservices CoreServices/CoreServices.h UTGetOSTypeFromString "-framework CoreServices"
     check_func_headers CoreMedia/CMFormatDescription.h kCMVideoCodecType_HEVC "-framework CoreMedia"
+    check_func_headers CoreMedia/CMFormatDescription.h kCMVideoCodecType_HEVCWithAlpha "-framework CoreMedia"
     check_func_headers CoreVideo/CVPixelBuffer.h kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange "-framework CoreVideo"
     check_func_headers CoreVideo/CVImageBuffer.h kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ "-framework CoreVideo"
     check_func_headers CoreVideo/CVImageBuffer.h kCVImageBufferTransferFunction_ITU_R_2100_HLG "-framework CoreVideo"
@@ -6409,6 +6417,7 @@ enabled libopus           && {
 enabled libpulse          && require_pkg_config libpulse libpulse pulse/pulseaudio.h pa_context_new
 enabled librabbitmq       && require_pkg_config librabbitmq "librabbitmq >= 0.7.1" amqp.h amqp_new_connection
 enabled librav1e          && require_pkg_config librav1e "rav1e >= 0.4.0" rav1e.h rav1e_context_new
+enabled librist           && require_pkg_config librist "librist >= 0.2" librist/librist.h rist_receiver_create
 enabled librsvg           && require_pkg_config librsvg librsvg-2.0 librsvg-2.0/librsvg/rsvg.h rsvg_handle_render_cairo
 enabled librtmp           && require_pkg_config librtmp librtmp librtmp/rtmp.h RTMP_Socket
 enabled librubberband     && require_pkg_config librubberband "rubberband >= 1.8.1" rubberband/rubberband-c.h rubberband_new -lstdc++ && append librubberband_extralibs "-lstdc++"

doc/APIchanges

@@ -15,77 +15,133 @@ libavutil:     2017-10-21
 
 API changes, most recent first:
 
-2021-02-21 - xxxxxxxxxx - lavu 56.66.100 - tx.h
+2021-03-21 - xxxxxxxxxx - lavu 56.72.100 - frame.h
+  Deprecated av_get_colorspace_name().
+  Use av_color_space_name() instead.
+
+-------- 8< --------- FFmpeg 4.4 was cut here -------- 8< ---------
+
+2021-03-19 - e8c0bca6bd - lavu 56.69.100 - adler32.h
+  Added a typedef for the type of the Adler-32 checksums
+  used by av_adler32_update(). It will be changed to uint32_t
+  at the next major bump.
+  The type of the parameter for the length of the input buffer
+  will also be changed to size_t at the next major bump.
+
+2021-03-19 - e318438f2f - lavf 58.75.100  - avformat.h
+  AVChapter.id will be changed from int to int64_t
+  on the next major version bump.
+
+2021-03-17 - f7db77bd87 - lavc 58.133.100 - codec.h
+  Deprecated av_init_packet(). Once removed, sizeof(AVPacket) will
+  no longer be a part of the public ABI.
+  Deprecated AVPacketList.
+
+2021-03-16 - 7d09579190 - lavc 58.132.100 - codec.h
+  Add AV_CODEC_CAP_OTHER_THREADS as a new name for
+  AV_CODEC_CAP_AUTO_THREADS. AV_CODEC_CAP_AUTO_THREADS
+  is now deprecated.
+
+2021-03-12 - 6e7e3a3820 - lavc 58.131.100 - avcodec.h codec.h
+  Add a get_encode_buffer callback to AVCodecContext, similar to
+  get_buffer2 but for encoders.
+  Add avcodec_default_get_encode_buffer().
+  Add AV_GET_ENCODE_BUFFER_FLAG_REF.
+  Encoders may now be flagged as AV_CODEC_CAP_DR1 capable.
+
+2021-03-10 - 42e68fe015 - lavf 58.72.100 - avformat.h
+  Change AVBufferRef related AVStream function and struct size
+  parameter and fields type to size_t at next major bump.
+
+2021-03-10 - d79e0fe65c - lavc 58.130.100 - packet.h
+  Change AVBufferRef related AVPacket function and struct size
+  parameter and fields type to size_t at next major bump.
+
+2021-03-10 - 14040a1d91 - lavu 56.68.100 - buffer.h frame.h
+  Change AVBufferRef and relevant AVFrame function and struct size
+  parameter and fields type to size_t at next major bump.
+
+2021-03-04 - a0eec776b6 - lavc 58.128.101 - avcodec.h
+  Enable err_recognition to be set for encoders.
+
+2021-03-03 - 2ff40b98ec - lavf 58.70.100 - avformat.h
+  Deprecate AVFMT_FLAG_PRIV_OPT. It will do nothing
+  as soon as av_demuxer_open() is removed.
+
+2021-02-27 - dd9227e48f - lavc 58.126.100 - avcodec.h
+  Deprecated avcodec_get_frame_class().
+
+2021-02-21 - 5ca40d6d94 - lavu 56.66.100 - tx.h
   Add enum AVTXFlags and AVTXFlags.AV_TX_INPLACE
 
-2021-02-14 - xxxxxxxxxx - lavd 58.12.100 - avdevice.h
+2021-02-14 - 4f49ca7bbc - lavd 58.12.100 - avdevice.h
   Deprecated avdevice_capabilities_create() and
   avdevice_capabilities_free().
 
-2021-02-xx - xxxxxxxxxx - lavu 56.xx.100 - common.h
+2021-02-10 - 1bda9bb68a - lavu 56.65.100 - common.h
   Add FFABS64U()
 
-2021-01-26 - xxxxxxxxxx - lavu 56.64.100 - common.h
+2021-01-26 - 5dd9567080 - lavu 56.64.100 - common.h
   Add FFABSU()
 
-2021-01-25 - xxxxxxxxxx - lavc 58.119.100 - avcodec.h
+2021-01-25 - 56709ca8aa - lavc 58.119.100 - avcodec.h
   Deprecate AVCodecContext.debug_mv, FF_DEBUG_VIS_MV_P_FOR, FF_DEBUG_VIS_MV_B_FOR,
   FF_DEBUG_VIS_MV_B_BACK
 
-2021-01-11 - xxxxxxxxxx - lavc 58.116.100 - avcodec.h
+2021-01-11 - ebdd33086a - lavc 58.116.100 - avcodec.h
   Add FF_PROFILE_VVC_MAIN_10 and FF_PROFILE_VVC_MAIN_10_444.
 
-2020-xx-xx - xxxxxxxxxx - lavu 56.63.100 - video_enc_params.h
+2020-01-01 - baecaa16c1 - lavu 56.63.100 - video_enc_params.h
   Add AV_VIDEO_ENC_PARAMS_MPEG2
 
-2020-12-03 - xxxxxxxxxx - lavu 56.62.100 - timecode.h
+2020-12-03 - eca12f4d5a - lavu 56.62.100 - timecode.h
   Add av_timecode_init_from_components.
 
-2020-xx-xx - xxxxxxxxxx - lavc 58.114.100 - avcodec.h
+2020-11-27 - a83098ab03 - lavc 58.114.100 - avcodec.h
   Deprecate AVCodecContext.thread_safe_callbacks. Starting with
   LIBAVCODEC_VERSION_MAJOR=60, user callbacks must always be
   thread-safe when frame threading is used.
 
-2020-11-25 - xxxxxxxxxx - lavc 58.113.100 - avcodec.h
+2020-11-25 - d243dd540a - lavc 58.113.100 - avcodec.h
   Adds a new flag AV_CODEC_EXPORT_DATA_FILM_GRAIN for export_side_data.
 
-2020-11-25 - xxxxxxxxxx - lavu 56.61.100 - film_grain_params.h
+2020-11-25 - 4f9ee87253 - lavu 56.61.100 - film_grain_params.h
   Adds a new API for extracting codec film grain parameters as side data.
   Adds a new AVFrameSideDataType entry AV_FRAME_DATA_FILM_GRAIN_PARAMS for it.
 
-2020-xx-xx - xxxxxxxxxx - lavf 58.64.100 - avformat.h
+2020-10-28 - f95d9510ff - lavf 58.64.100 - avformat.h
   Add AVSTREAM_EVENT_FLAG_NEW_PACKETS.
 
-2020-xx-xx - xxxxxxxxxx - lavu 56.60.100 - buffer.h
+2020-09-28 - 68918d3b7f - lavu 56.60.100 - buffer.h
   Add a av_buffer_replace() convenience function.
 
-2020-09-xx - xxxxxxxxxx - lavu 56.59.100 - timecode.h
+2020-09-13 - 837b6eb90e - lavu 56.59.100 - timecode.h
   Add av_timecode_make_smpte_tc_string2.
 
-2020-08-21 - xxxxxxxxxx - lavu 56.58.100 - avstring.h
+2020-08-21 - 06f2651204 - lavu 56.58.100 - avstring.h
   Deprecate av_d2str(). Use av_asprintf() instead.
 
-2020-08-04 - xxxxxxxxxx - lavu 56.58.100 - channel_layout.h
+2020-08-04 - 34de0abbe7 - lavu 56.58.100 - channel_layout.h
   Add AV_CH_LAYOUT_22POINT2 together with its newly required pieces:
   AV_CH_TOP_SIDE_LEFT, AV_CH_TOP_SIDE_RIGHT, AV_CH_BOTTOM_FRONT_CENTER,
   AV_CH_BOTTOM_FRONT_LEFT, AV_CH_BOTTOM_FRONT_RIGHT.
 
-2020-07-xx - xxxxxxxxxx - lavu 56.57.100 - cpu.h
+2020-07-23 - 84655b7101 - lavu 56.57.100 - cpu.h
   Add AV_CPU_FLAG_MMI and AV_CPU_FLAG_MSA.
 
-2020-07-xx - xxxxxxxxxx - lavu 56.56.100 - imgutils.h
+2020-07-22 - 3a8e927176 - lavu 56.56.100 - imgutils.h
   Add av_image_fill_plane_sizes().
 
-2020-07-xx - xxxxxxxxxx - lavc 58.96.100 - packet.h
+2020-07-15 - 448a9aaa78 - lavc 58.96.100 - packet.h
   Add AV_PKT_DATA_S12M_TIMECODE.
 
 2020-06-12 - b09fb030c1 - lavu 56.55.100 - pixdesc.h
   Add AV_PIX_FMT_X2RGB10.
 
-2020-06-xx - xxxxxxxxxx - lavu 56.54.100 - frame.h
+2020-06-11 - bc8ab084fb - lavu 56.54.100 - frame.h
   Add AV_FRAME_DATA_SEI_UNREGISTERED.
 
-2020-06-xx - xxxxxxxxxx - lavu 56.53.100 - log.h opt.h
+2020-06-10 - 1b4a98b029 - lavu 56.53.100 - log.h opt.h
   Add av_opt_child_class_iterate() and AVClass.child_class_iterate().
   Deprecate av_opt_child_class_next() and AVClass.child_class_next().