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

* commit '79dd756e':
  rtmpproto: Fix a typo
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ced7238c':
  rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '752e71e7':
  rtpdec_hevc: Rename a variable for clarity
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '74b02377':
  mov: Correctly check the color transfer characteristics range
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1ac5a29b':
  imc: fix order of operations in coefficients read
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Mika Raento <mikie@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Commit message by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Fixes ticket #3944.
Signed-off-by: Lou Logan <lou@lrcd.com>

Fixes the decoding of the ASS stream in a mkv from a fansub release from
Coalgirls.

This simplifies the logic for the fix in the next commit.

Fixes Ticket #3207

We want subtitles tests to match exactly line endings and trailing
characters.

This makes tracking subtitles changes simpler.

Signed-off-by: Lou Logan <lou@lrcd.com>

* commit 'e5cfc8fd':
  sdp: Provide out of bound parameter sets for HEVC if extradata is set
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9b7f932e':
  rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '557d4c4e':
  avconv: replace AVCodecContext.time_base with framerate

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

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

* commit '2d6e5849':
  lavf: switch to AVCodecContext.framerate for demuxing

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

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

They are not just inverses of each other.
This should restore behavior to before the introduction of framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

They are not just inverses of each other.
This should restore behavior to before the introduction of framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

They are not just inverses of each other.
This should restore behavior to before the introduction of framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

time_base != 1/framerate for example for interlaced video
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7ea1b347':
  lavc: deprecate the use of AVCodecContext.time_base for decoding

Conflicts:
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/mpegvideo_parser.c
	libavcodec/utils.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Reported-by: Ruoyu <liangry@ucweb.com>

Reported-by: Ruoyu <liangry@ucweb.com>

* commit 'd565fef1':
  vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check

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

* commit 'c1724623':
  vdpau: have av_vdpau_bind_context() fail on unsupported flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e09a947c':
  doc: fix typing mistake
Merged-by: Michael Niedermayer <michaelni@gmx.at>