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

* commit '40d94967':
  dca: use defines for subband related constants
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '8563f988':
  x86: use emms after ff_int32_to_float_fmul_scalar_sse
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'f0f54117':
  checkasm: x86: post commit review fixes
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'f4f27e4c':
  x86: zero extend the 32-bit length in int32_to_float_fmul_scalar implicitly
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '69a68593':
  Remove stray line breaks from avpriv_{report_missing_feature|request_samples}
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '5049f6b7':
  rtpdec_jpeg: Coalesce redundant error checks
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '2008f760':
  dca: remove unused decode_hf function and quant_d tables
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'aebf0707':
  dca: change the core to work with integer coefficients.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '85990140':
  dca: Add math helpers.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '489e6add':
  checkasm: add fmtconvert tests
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '568a4323':
  checkasm: add synth_filter test
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e71b747e':
  checkasm: add tests for dcadsp
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '9d218d57':
  checkasm: add float comparison util functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Previously it included the SRC_PATH in every title.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Also use a unsigned constant for the shift calculation, as 1 << 31 is
undefined for int32_t. This is also fixed oggparsetheora.

This fixes ubsan runtime error: shift exponent is too large for
32-bit type 'int'
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

* commit '711781d7':
  x86: checkasm: check for or handle missing cleanup after MMX instructions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'cc29d96d':
  arm64: fix inverted register order in transpose_4x4H
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '5ea59b1f':
  exr: fix out of bounds read in get_code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '17776638':
  opus: Fix typo causing overflow in silk_stabilize_lsf
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '90b1b935':
  arm: add ff_int32_to_float_fmul_array8_neon
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'a0fc780a':
  arm64: int32_to_float_fmul neon asm
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '705f5e5e':
  arm64: port synth_filter_float_neon from arm
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'c33c1fa8':
  arm64: convert dcadsp neon asm from arm
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'e2710e79':
  arm: add a cpu flag for the VFPv2 vector mode
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '5dfe4eda':
  x86_64: int32_to_float_fmul_scalar sign extend integer length
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '64034849':
  arm64: add cycle counter support
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '50078c1c':
  libavutil: move FFALIGN macro from common.h to macros.h
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'dbce0179':
  mpegtsenc: add flag to embed an AC-3 ES the DVB way
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit 'cc4c2420':
  avresample: Mark avresample_buffer() as pointer to const
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Fixes ticket #5117

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

ff_clz is faster, and uses an intrinsic (at the moment on GCC). exp2 is
a wasteful function for a simple integer exponentiation.

Untested.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>

Fixes Ticket #5032

The samples in Ticket #5032 is using \r\r\n as line breaks.  Since we
already are handling \r, or \n, or \r\n as line breaks, \r\n\n will be
considered as a double line breaks. This is an issue because
ff_subtitles_read_text_chunk() will as a result stop extracting a chunk
after just one line.

So instead of parsing the SRT by "chunks" (which means splitting every
double LB), this new parser is detecting timing lines, and split the
events on this basis. While this sounds safe and simple, it needs to
take into account the event number preceding the timing line while
handling situations such as:

 - event number starting at 0 or actually any number instead of 1
 - event numbers not being ordered at all
 - event number being followed by text garbage (this really happened,
   see Ticket #4898)
 - event payload containing one or multiple number (a protagonist saying
   a count-down, a date or whatever) which could be confused with a
   chapter number
 - event number being empty (see Ticket #2167)
 - all kind of weird line breaks can appear randomly like wild pokémons
 - untrustable line breaks (Ticket #5032)

The sample madness.srt tries to sum up most of this into one sample,
ticket5032-rrn.srt is the file containing \r\r\n line breaks. and
empty-events-2167.srt contains empty events.

* commit '5bc223b1':
  r3d: fix an invalid read introduced in 6bf4c1d7Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '64f8c439':
  rtmpproto: Include the full path as app when "slist=" is found
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '9f0b6e68':
  vocdec: do not create the stream in read_header()

Not merged as it breaks FATE.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '2d0432d9':
  vocdec: put the code not shared with other demuxers under appropriate ifdef
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

* commit '09ae7b81':
  flvdec: do not create any streams in read_header()

Not merged. The demuxer issues warnings when a new stream is encountered
and reading the metadata requires that streams already exist.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

This unbreaks muxing-encoding
Example:
ffmpeg -i matrixbench_mpeg2.mpg new.avi

-rw-r----- 1 michael michael 226035354 Jan  1 16:27 new.avi
-rw-r----- 1 michael michael  10016802 Jan  1 16:28 ref.avi

Also av_get_audio_frame_duration() itself uses frame_size

This reverts commit 29e6606e, reversing
changes made to 53448461.