Merge commit '199fb40278146c5bb162990c66ad3cd561abc780'

* commit '199fb40278146c5bb162990c66ad3cd561abc780':
  rtpdec: Use ffio_free_dyn_buf

Conflicts:
libavformat/rtpdec_latm.c
libavformat/rtpdec_svq3.c
libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '8a273a746061a112e5e35066a8fd8e146d821a62'

* commit '8a273a746061a112e5e35066a8fd8e146d821a62':
  avio: Add an internal utility function for freeing dynamic buffers

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '078d43e23a7a3d64aafee8a58b380d3e139b3020'

* commit '078d43e23a7a3d64aafee8a58b380d3e139b3020':
  rtpdec: Free depacketizers if the init function failed

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'bb4a310bb85f43e62240145a656b1e5285b14239'

* commit 'bb4a310bb85f43e62240145a656b1e5285b14239':
  rtpdec: Don't free the payload context in the .free function

Conflicts:
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_mpegts.c
libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'f4b59334bd898c47c9ac30999a346176548630a8'

* commit 'f4b59334bd898c47c9ac30999a346176548630a8':
  rtpdec: Remove the now unused .alloc field

Merged-by: Michael Niedermayer <michaelni@gmx.at>

avformat/rtpdec_vp9: remove alloc/free functions

Simplify code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '78791c086bcaf9eb084c27555b31fea8bbb7624a'

* commit '78791c086bcaf9eb084c27555b31fea8bbb7624a':
  rtpdec: Use .init instead of .alloc to set default values

Conflicts:
libavformat/rdt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '88434f9725e7c9484dcbcf323566ae88a2904f32'

* commit '88434f9725e7c9484dcbcf323566ae88a2904f32':
  rtpdec: Remove unnecessary inline attributes

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74'

* commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74':
  rtpdec: Don't pass non-const pointers to fmtp attribute parsing functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'ac0e54fda9305cc7d149007f5b512bb8619f7c78'

* commit 'ac0e54fda9305cc7d149007f5b512bb8619f7c78':
  rtpdec: Add const to string parameters in internal fmtp parsing functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '12251f997bbc0abb93be39c51021e6d404ca385f'

* commit '12251f997bbc0abb93be39c51021e6d404ca385f':
  rtpdec: Remove unnecessary checks

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb'

* commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb':
  rtpenc: Merge the h264 and hevc packetizers

Conflicts:
libavformat/rtpenc_hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15'

* commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15':
  rtpdec_hevc: Share the implementation of fragmented packets with h264

Conflicts:
libavformat/rtpdec_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'f3449062a8d100ac4f703647336c32b126aa99f1'

* commit 'f3449062a8d100ac4f703647336c32b126aa99f1':
  rtpdec_hevc: Reduce indentation level by returning early on errors

Conflicts:
libavformat/rtpdec_hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0'

* commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0':
  rtpdec_hevc: Share the implementation of parsing a=framesize with h264

Conflicts:
libavformat/rtpdec_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '5956f489d0452ff6dea6b6b81b4fa8e596fc5684'

* commit '5956f489d0452ff6dea6b6b81b4fa8e596fc5684':
  rtpdec_hevc: Add asterisks at the start of each long comment line

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8'

* commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8':
  rtpdec: Get rid of all trivial .alloc/.free functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'e72605f80bf5cbe32053a554ccc137e0a99cf3dd'

* commit 'e72605f80bf5cbe32053a554ccc137e0a99cf3dd':
  rtpdec: Allow allocating and freeing the private data without explicit functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '2b982e92f42a6e661d90b12b6592cd13cae496d4'

* commit '2b982e92f42a6e661d90b12b6592cd13cae496d4':
  rtpdec: Set need_parsing via a handler field

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'b7a4c319fda22aa91ce29692d728ec6103b514f6'

* commit 'b7a4c319fda22aa91ce29692d728ec6103b514f6':
  rtpdec: Allow setting the need_parsing field in RTPDynamicProtocolHandler

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'b651c9139e1ab222d5aab9151dcd7d6e40e49885'

* commit 'b651c9139e1ab222d5aab9151dcd7d6e40e49885':
  rtpdec_mpa_robust: Move .enc_name to the start of the struct

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'db158f0dd217cf839be8af195d66cf49a76537a8'

* commit 'db158f0dd217cf839be8af195d66cf49a76537a8':
  rtpdec: Remove unnecessary _if_needed suffixes on functions

Conflicts:
libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '353b492d0f2a21ae8eb829db1ac01b54b2a4d202'

* commit '353b492d0f2a21ae8eb829db1ac01b54b2a4d202':
  rtpdec: Change enc_name to a pointer instead of a fixed-size buffer

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '0752f700d63f6b15ffd5369ac7615414cce71247'

* commit '0752f700d63f6b15ffd5369ac7615414cce71247':
  rtpdec_h264: Remove an unnecessary include

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '247764a592f83521f9c1ccdc900b00a8b84f3c87'

* commit '247764a592f83521f9c1ccdc900b00a8b84f3c87':
  rtpdec_h264: Remove unnecessary struct padding

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b'

* commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b':
  rtpdec_amr: Use the common indentation style

Merged-by: Michael Niedermayer <michaelni@gmx.at>

rtpdec: Use ffio_free_dyn_buf

Signed-off-by: Martin Storsjö <martin@martin.st>

avio: Add an internal utility function for freeing dynamic buffers

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Free depacketizers if the init function failed

This is different from how it is handled in codecs/demuxers/muxers
though (where the close function isn't called if the open function
failed), but since the number of depacketizers that have an .init
function is quite limited, this is easy to change.

The main point is that if the init function failed, we shouldn't
try to use that depacketizer at all - this makes sure that the
parse function doesn't need to check for the things that were
initialized in the init function.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Don't free the payload context in the .free function

This makes it more consistent with depacketizers that don't have any
.free function at all, where the payload context is freed by the
surrounding framework. Always free the context in the surrounding
framework, having the individual depacketizers only free any data
they've specifically allocated themselves.

This is similar to how this works for demuxer/muxers/codecs - a
component shouldn't free the priv_data that the framework has
allocated for it.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Remove the now unused .alloc field

Always use the .priv_data_size field instead.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Use .init instead of .alloc to set default values

The ugly error handling in rdt gets improved in a later commit.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Remove unnecessary inline attributes

These functions are far from performance critical, so there's no
point in marking them as inline.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Don't pass non-const pointers to fmtp attribute parsing functions

This makes it clear that the individual parsing functions can't
touch the parsed out value.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Add const to string parameters in internal fmtp parsing functions

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Remove unnecessary checks

The free function of a depacketizer won't be called if data is NULL.

Signed-off-by: Martin Storsjö <martin@martin.st>

Merge commit '74d318f138f2a3f1b2fe81aea826d80d1e60f54c'

* commit '74d318f138f2a3f1b2fe81aea826d80d1e60f54c':
  rtsp: Fix the indentation of a linewrapped statement

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '3cd5828fc0007e6d056067444de053a34ddedd02'

* commit '3cd5828fc0007e6d056067444de053a34ddedd02':
  rtpdec: Add missing trailing commas

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '04a1be8e28e81f3967eace7705343c450616cc95'

* commit '04a1be8e28e81f3967eace7705343c450616cc95':
  libavformat: add T.140 RTP depacketization (RFC 4103)

Conflicts:
libavformat/rtpdec.c
libavformat/version.h

See: af940e6cb1212d4338e55c03498ef5ae40e6e749
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '26524e358147aade6e9dd18fff42d61b966bbc70'

* commit '26524e358147aade6e9dd18fff42d61b966bbc70':
  rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA

See: afb0e5a810ae110a69b618e5fbed78a7c1b899f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/h264: Only reinit quant tables if a new PPS is allowed

Fixes null pointer dereference
Fixes: signal_sigsegv_3042097_3007_cov_1741463594_non_monotone_timestamps1.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc/filters.texi: add reference link to video size syntax description

Update the filter option documentation text to link to ffmpeg-utils
documentation for video size syntax description.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

avformat/movenc: Fix writing ACLR atoms for DNxHD

Using the copy codec ACLR atoms where incorrectly written

During the creation of the ACLR atom we are assuming the vos_data
contains the DNxHD header. This change makes this explicit and
ensures we don't over write the stream with the extra_data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/dss: Set packet position correctly

pos previously was set but then overwritten

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

rtpenc: Merge the h264 and hevc packetizers

They share a great deal of common structure; only a few minor
bits in the headers differ.

This also fixes an off-by-one in sending of the last fragment
of large HEVC nals (where it previously sent len+2 bytes, even
if it should have been len+RTP_HEVC_HEADERS_SIZE aka len+3).

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec_hevc: Share the implementation of fragmented packets with h264

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec_hevc: Reduce indentation level by returning early on errors

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec_hevc: Share the implementation of parsing a=framesize with h264

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec_hevc: Add asterisks at the start of each long comment line

This is the common style for such comments.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Get rid of all trivial .alloc/.free functions

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Allow allocating and freeing the private data without explicit functions

This can reduce the amount of boilerplate in simple depacketizers.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Set need_parsing via a handler field

This avoids implementing a full function just to set this one
field.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Allow setting the need_parsing field in RTPDynamicProtocolHandler

This allows getting rid of quite a bit of boilerplate in depacketizers.

The default value (initializing need_parsing to 0, aka
AVSTREAM_PARSE_NONE) is the same as it is initialized to by default
in AVStream.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec_mpa_robust: Move .enc_name to the start of the struct

This makes it match the other depacketizers.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Remove unnecessary _if_needed suffixes on functions

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Change enc_name to a pointer instead of a fixed-size buffer

This avoids allocating space for a too large buffer for all the
name strings.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec_h264: Remove an unnecessary include

Nothing in this file use any network functions.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec_h264: Remove unnecessary struct padding

There's no point in adding padding in the allocation of a depacketizer
specific context struct.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec_amr: Use the common indentation style

Signed-off-by: Martin Storsjö <martin@martin.st>

rtsp: Fix the indentation of a linewrapped statement

Signed-off-by: Martin Storsjö <martin@martin.st>

rtpdec: Add missing trailing commas

Signed-off-by: Martin Storsjö <martin@martin.st>

libavformat: add T.140 RTP depacketization (RFC 4103)

Map this to AV_CODEC_ID_TEXT.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA

Signed-off-by: Martin Storsjö <martin@martin.st>

avcodec/mss4: check return value of init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavc/pthread_slice: release entries

When calling ff_alloc_entries, a number of entries are created.
They are never freed, as running fate with slice threading and
several frames on e.g. fate-hevc-conformance-ENTP_A_Qualcomm_1
would show.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/nutdec: fix isom and mpa build deps

Fixes the following link error:
  nutdec.c:(.text+0x2d47): undefined reference to `ff_codec_movvideo_tags'
  isom.c:(.text+0x332): undefined reference to `avpriv_mpeg4audio_get_config'
  isom.c:(.text+0x39e): undefined reference to `avpriv_mpa_freq_tab'

avcodec/snow: Free all planes and bands independent of the last count

Fixes memleak
Fixes: signal_sigsegv_24169e6_3445_cov_3778346427_snow_chroma_bug.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/snowdec: Fix ref value check

Fixes integer overflow and out of array read.
Fixes: signal_sigsegv_24169e6_3445_cov_3778346427_snow_chroma_bug.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swscale/utils: add asserts to check filterpos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swscale/utils: More carefully merge and clear coefficients outside the input

Fixes out of array read
Fixes: asan_heap-oob_35ca682_1474_cov_3230122439_aletrek_tga_16bit.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mov: Check av_add_index_entry() return value

Fixes NULL pointer dereference
Fixes: signal_sigsegv_b060e0_3794_cov_1293954059_vc1-wmapro.ism
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Revert "takdec: pad filter coeff buffer for DSP functions"

This reverts commit e0c7ba40cf0bb521430f4a808ed1f1a408093f9c.

Valgrind complains about invalid reads, which generate segfaults in some
systems.

Merge commit 'ce52869c22738ad584995d48103ce3aa2301736b'

* commit 'ce52869c22738ad584995d48103ce3aa2301736b':
  fate: Rename fate-dts test to fate-dca-core

Conflicts:
tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41'

* commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41':
  qsv: Skip qsv.h compilation if qsv is not enabled

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'cdcc370293a159c321e41af7f0eef141c62d698d'

* commit 'cdcc370293a159c321e41af7f0eef141c62d698d':
  rtsp: punch holes again after pause

See: 22bb5bd7a3b55c25bfef130ad89e8574dd47af1d
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '061c489895d29049a88dc6118e4b639a273b31d6'

* commit '061c489895d29049a88dc6118e4b639a273b31d6':
  eamad: check for out of bounds read

Conflicts:
libavcodec/eamad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '161442ff2c4b0dd8a5072c6bbe6bf55303fffccf'

* commit '161442ff2c4b0dd8a5072c6bbe6bf55303fffccf':
  mdec: check for out of bounds read

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc'

* commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc':
  rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units

Conflicts:
libavformat/rtpdec_hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/snowenc: Allocate and reference coded_frame correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/roqvideoenc: Allocate and reference coded_frame correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/hlsenc: Warn if a non file protocol is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fate: Rename fate-dts test to fate-dca-core

The codec is referred to as DCA in other parts of libav.

qsv: Skip qsv.h compilation if qsv is not enabled

avcodec/hqx: remove superfluous log message

Signed-off-by: Paul B Mahol <onemda@gmail.com>

rtsp: punch holes again after pause

When a client behind a NAT issues a pause command, and stay paused for a
long time, the router may stop the RTP/RTCP port redirection. Resend the
hole punching packets before each PLAY command to cause the router to
restart the port redirection in that case.

Move the existing code for sending the packets from the SETUP phase
to the PLAY phase.

Signed-off-by: Martin Storsjö <martin@martin.st>

eamad: check for out of bounds read

Bug-Id: CID 1257500
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

mdec: check for out of bounds read

Bug-Id: CID 1257501
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units

Only the first aggregation unit has 2 bytes (DONL) prepended, if
such a field is in use.

Signed-off-by: Martin Storsjö <martin@martin.st>

avfilter/palette{gen,use}: add Copyright

Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'

* commit '35c6ce76b107225a19eb33aea38857d2405882af':
  Canopus HQX decoder

Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '36a6fb989b017898041703025ef20028146675a8'

* commit '36a6fb989b017898041703025ef20028146675a8':
  hevc_deblock: Fix compilation with nasm

See: c75fdee747179e21e3cc137b2565ba911b17f9c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a'

* commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a':
  libschroedinger: Check memory allocations

Conflicts:
libavcodec/libschroedinger.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '521979e6b1e7a89751aebc285a40d6508f8af48f'

* commit '521979e6b1e7a89751aebc285a40d6508f8af48f':
  configure: Properly fail when libcdio/cdparanoia is not found

Conflicts:
configure

See: f514b5dff769a331ea2153c23594d9b29b667141
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7'

* commit 'f7cc6627c01ad3f5bc6ea2d0e6f8adb3a0b490d7':
  configure: Use pkg-config for libdc1394 discovery

Merged-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/paletteuse: add diff_mode

avfilter/paletteuse: fix error dithering accuracy

avcodec/a64multienc: Assert that the Packet size does not grow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/a64multienc: simplify frame handling code

This also fixes a memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/a64multienc: fix use of uninitialized values in to_meta_with_crop

Averaging over 2 pixels doesn't work correctly for the last pixel, because the
rest of the buffer is not initialized.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/a64multienc: initialize mc_meta_charset to zero

This fixes the use of uninitialized values in avpriv_do_elbg.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>