* commit '8de77b66':
  fate: Add fic-in-avi test

Conflicts:
	tests/ref/fate/fic-avi

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

* commit 'a24a2527':
  aarch64: NEON optimized FIR audio resampling
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cae8df78':
  lavr: define ResampleContext in resample.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a88e1d1c':
  lavu: add CHK_OFFS as AV_CHECK_OFFSET to check struct member offsets
Merged-by: Michael Niedermayer <michaelni@gmx.at>

None of the handwritten asm in this function seems to be SSE2
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '152b797c':
  flv: Do not mangle dts values for negative cts
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5d983fdb':
  flv: Warn only once
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '374fdc8c':
  flv: Improve log messages

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

Optimized for the default filter length 16.

30% faster opus silk decoding.

Required for arch optimized resampling.

Fixes: Ticket 3588

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

Provide correct rpath flags to ld when --enable-rpath is provided.

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

* commit '7cade8ea':
  on2avc: change a comment at #endif to match actual define
Merged-by: Michael Niedermayer <michaelni@gmx.at>

before:
5225 decicycles in IDCT, 32756 runs, 12 skips

after:
5057 decicycles in IDCT, 32765 runs, 3 skips
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This also tests LINEAR_CORE_FLT_SSE

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

The code was missing 1 bit in the src format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Some applications really mean to send negative pts.

No point in sending the message multiple time.

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

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

Messages should start with a capital letter and possibly end with a "."
if they are statements.

* commit 'e2834567':
  On2 AVC decoder

Conflicts:
	Changelog
	configure
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd7eb8f90':
  fic: Make warning message more accurate
  fic: Remove redundant clips
  fic: Simplify alpha blending

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

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

The equations can't overflow or underflow anyway.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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

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

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

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

Fix trac ticket #3523.

Restore the old name, which was more meaningful and consistent with the
names of the other examples.

Fixes assertion failure
Fixes Ticket3575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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