* commit '86a36108':
  lmlm4: K&R formatting cosmetics

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

* commit '95d312d6':
  concat: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '28f5cd31':
  fate: Switch ra4-288 test from framecrc() to pcm()

Conflicts:
	tests/fate/real.mak

The test is kept disabled as it still does not pass on x86-64 due to float
rounding
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd07ddc93':
  avcodec: Fix a doxy comment to refer to the right function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

The decoder is float-based and the test needs to allow for some fuzz.
Signed-off-by: Diego Biurrun <diego@biurrun.de>

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

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

Also add sse2 versions for both.
put_pixels_clamped port and sse2 version originally written by Timothy Gu.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

* commit '2f172f1a':
  rtsp: Clear the session id on redirects
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ddf5fb71':
  rtpenc: HEVC/H.265 support

Conflicts:
	Changelog
	libavformat/rtpenc.c
	libavformat/rtpenc_hevc.c
	libavformat/version.h

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

* commit 'a2efbecc':
  libavformat: Move avc mp4 startcode parsing to a shared file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Same behavior as in simple_idct.
This way the best optimized versions available will be used instead.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: Philip DeCamp <decamp@mit.edu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes handling redirects in case the server provided a session
id within the redirect reply.
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

~15% faster than sse2.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@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>

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

* commit 'c463dfc7':
  rtpdec_hevc: Drop a duplicated, nonstandard entry
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The RFC spec draft only specifies the "H265" name - there is no
specification saying how to interpret "HEVC" (if such a packet
format is specified it could be an entirely different format).

Since this is a very new standard (still a draft), there is little
need for compatibility with existing, broken implementations. Therefore
remove the extra alias, to avoid the risk of encouraging incorrect
usage.

Intentionally keeping the ff_hevc_dynamic_handler name for the
handler, to use "hevc" consistently as name for the codec instead
of "h265" within the library internals as long as there only is one
single variant in actual use.
Signed-off-by: Martin Storsjö <martin@martin.st>

Fixes build with musl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Other buffers are already there.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

Should fix ticket #3958.
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>

This may make fate failures where only the console output is available
easier to analyze

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

* cus/stable:
  ffplay: move pts calculating code to generic decoder
  ffplay: factorize decoder functions to generic decoder
  ffplay: handle fullscreen status on resize event
Merged-by: Michael Niedermayer <michaelni@gmx.at>