* commit 'cf7860db':
  x86: dsputil: Suppress deprecation warnings for XvMC bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd1916d13':
  dsputil/pngdsp: fix signed/unsigned type in end comparison

Conflicts:
	libavcodec/dsputil.c

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

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

This prevents breaking (non asm) striping in that case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This more closely matches the actual use, also we use plain
strip without these flags for striping
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0673ede9':
  configure: add strip flags checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Launch option is defined in the Feed section.

Spotted-by: lazy ubitux

Should be redundant now that the option is documented.

The section shows only a limited use case, contains only redundant
information, and various mysterious mentions about things which don't
work correctly.

Mentioning build options, or bugs, or mysterious limitations should not
be done in the manual.

These parts are scheduled for removal on the next version bump.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Fixes out of array accesses and integer overflows.

This will check if -wN '..@*' is available and fall back on -x if not;
when none are available, do not run strip at all to prevent removing
functions that might be actually needed.

This is required to build with FFmpeg compilation options.

* qatar/master:
  h263dec: sanitize a condition.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4d388c0c':
  h264_refs: make sure not to write over the bounds of the default ref list

Conflicts:
	libavcodec/h264_refs.c

This condition should be impossible and was checked for by asserts.
the asserts are moved up in this merge to gurantee that no out of array
access can happen even if the state is "impossible".
Also if such impossible states could somehow be created, that should
be dealt with and not silently ignored.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

While still incomplete, this is better than nothing at all.