* commit '7acdd3a1':
  hevc_filter: avoid excessive calls to ff_hevc_get_ref_list()

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

* commit '52a2c17e':
  hevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list()

Conflicts:
	libavcodec/hevc_refs.c

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

* commit 'a7a17e3f':
  hevc_filter: move some conditions out of loops

Conflicts:
	libavcodec/hevc_filter.c

This is possibly less readable than the variant used before.
Thus please take a look and if people agree its worse, dont
hesitate to revert.

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

* commit '70211539':
  hevc: deobfuscate slice/tile boundary handling for DBF

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_filter.c

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

* commit '55019715':
  hevc_filter: drop more redundant checks

Conflicts:
	libavcodec/hevc_filter.c

No change, as the removed checks where not in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '65b8b6c4':
  hevc_filter: drop redundant checks

Conflicts:
	libavcodec/hevc_filter.c

No change as the removed checks where not in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4d1ff2a4':
  hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled

Conflicts:
	libavcodec/hevc.c

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

No change in the generated asm.

1) each of the loops run within a single CTB, so the relevant reference
list is constant
2) when that CTB is, or lies on the same slice as, the current one, we
can use a simple access instead of a relatively expensive call to
ff_hevc_get_ref_list()

It makes no sense and cannot happen in any place from which this
function is called.

Use named constants instead of magic numbers, avoid using variables with
inverse meaning from what their name implies.

The if() around those loops ensures this condition is always false.

ff_hevc_deblocking_boundary_strengths() is never called if the
deblocking filter is disabled for the slice.

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

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

* commit 'd35b94fb':
  avcodec: Rename xvidmmx IDCT to xvid

Conflicts:
	doc/APIchanges
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes assertion failure
Fixes Ticket3822

as a side-effect this makes some mkv files a few bytes smaller
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '84d173d3':
  xvididct: Ensure that the scantable permutation is always set correctly
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6f1960ab':
  idct: cosmetics: Drop one unnecessary if-block level

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

* commit '444c7358':
  configure: Only run gas checks on ARM and PowerPC
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0026e356':
  configure: Die if gas is unavailable under aarch64 as well as ARM

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

* commit 'e4c9e59a':
  mpeg: K&R formatting cosmetics

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

* commit '45469760':
  mpegts: Use av_free() to free memory allocated by av_strdup()

Conflicts:
	libavformat/mpegtsenc.c

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

Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The Xvid IDCT is not MMX-specific.

This fixes cases where the scantable permuation would get overwritten by
the general idctdsp initialization.

This makes the code about 1.5x faster without any noticeable difference
in the output.

This has no impact on overall performance, since the block DCT taking
most of the time anyway.

Add a tlength option with frequency and timeclamp variable

Add to the volume option support for frequency and timeclamp variable,
   a_weighting, b_weighting and c_weighting functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The AALP atom is necessary to properly decode the alpha channel.
Needed for ticket #3707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Standalone GNU assembly is not used on x86.