* commit '7640c4a3':
  aacdec: Tables for length 480 AAC ELD.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0ee25733':
  aacdec: Support for ER AAC in LATM

Conflicts:
	libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'edd9ea3f':
  aacdec: Refactor aac_er_decode_frame.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Update after b37858ea.

* commit '82bd8a57':
  aacdec: Refactor decode_ics_info.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

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

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

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

Use edge emu buffers
And enable the code unconditionally

Speed difference without USE_SAO_SMALL_BUFFER and with the new code:
Decicycles: 26772->26220 (BO32),  83803->80942 (BO64)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

cherry picked from commit 5d9f79edef2c11b915bdac3a025b59a32082f409

SAO edge filter uses pre-SAO pixel data on the left and top of the ctb, so
this data must be kept available. This was done previously by having 2
copies of the frame, one before and one after SAO.

This commit reduces the storage to just that, instead of the previous whole
frame.

Commit message taken from patch by Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This could overflow and crash at least on 32 bit systems.
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This can lead to an endless loop by seeking back a few bytes after each
attempted chunk read. Assuming negative sizes are always invalid, this
is easy to fix. Other code in this demuxer treats negative sizes as
invalid as well.

Fixes ticket #4262.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This mimicks what is done for the other instruction sets.
Tested-by: James Almer <jamrial@gmail.com>
Tested-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '898276c1':
  r3d: Fix pos type
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ec524ed1':
  tta: Fix framepos and start_offset types

Conflicts:
	libavformat/tta.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a6653787':
  libopencv: Check kernel_str life cycle

Conflicts:
	libavfilter/vf_libopencv.c

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

This is currently always true, the assert protects against
future changes to the code breaking this assumtation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9b8c8a93':
  svq1dec: Validate the stages value strictly

Not merged, this is wrong, the condition is not possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6f7a3283':
  svq1enc: correctly handle memory error and allocations

Conflicts:
	libavcodec/svq1enc.c

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

* commit '67e9f390':
  isom: Decode Prores 4444 XQ with the existing Prores decoder

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

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

* commit 'e3528d2a':
  mov: Implement parsing of the "HandlerName" from the MP4 HDLR atom

Conflicts:
	libavformat/mov.c

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

* commit '27b99d92':
  siff: Return more meaningful error values

Conflicts:
	libavformat/siff.c

See: 29c3ebf5Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '75439bb3':
  siff: K&R formatting cosmetics

Conflicts:
	libavformat/siff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

industrial cameras usually mark the trigger frame as frame number 0
all frames saved before trigger frame receive a negative sequence number
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avio_tell can return a negative number.

Bug-Id: CID 1265715
CC: libav-stable@libav.org

Also propagate errors.

CC: libav-stable@libav.org
Bug-Id: CID 1238812

The string might or might not be set depending if there
are args and in case of error it must be freed nonetheless.

CC: libav-stable@libav.org
Bug-Id: CID 739878 / CID 739882