* commit '34bbc81d':
  lavf: simplify ff_hevc_annexb2mp4_buf

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

* commit '4a856239':
  configure: Use the right pkgconf file for openjpeg

Conflicts:
	configure

No change as the incorrect code wasnt in ffmpegs configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ee17be3f':
  hevc: Use get_se_golomb_long
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5eacbb53':
  golomb: Add a get_se_golomb_long
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Use ff_hevc_annexb2mp4 instead of duplicating
its functionality, and update the documentation
to match the new behavior.

* qatar/master:
  Work around broken floating point limits on some systems.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8cafeb8b':
  mxfdec: Validate parameters to strftime

Conflicts:
	libavformat/mxfdec.c

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

The current release of version 1 uses libopenjpeg1.

Do not use inline functions that refer to tables present in other
libraries.

Useful in libavformat mostly.

The values of {FLT,DBL}_{MAX,MIN} macros on some systems (older musl
libc, some BSD flavours) are not exactly representable, i.e.
(double)DBL_MAX == DBL_MAX is false
This violates (at least some interpretations of) the C99 standard and
breaks code (e.g. in vf_fps) like
double f = DBL_MAX;
[...]
if (f == DBL_MAX) { // f has not been changed yet
    [....]
}

The MSVCRT version of strftime calls the invalid parameter handler
if the struct values in struct tm are invalid. In case no invalid
parameter handler is set for the process, the process is aborted.

This fixes fate failures on MSVC builds since 570af382.

Based on a patch by Hendrik Leppkes.
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a823d094':
  matroskaenc: write private data in hvcC format for HEVC.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '4f3db5d3':
  movenc: allow muxing HEVC in MODE_MP4.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'b6c61fb8':
  movenc: enable Annex B to MP4 conversion for HEVC tracks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '20b40a59':
  movenc: write hvcC tag for HEVC.

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

* commit '1d9014f0':
  movenc: use 'hev1' tag for HEVC in MODE_MOV.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3e0175d8':
  riff: add VP9 fourcc

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

* commit 'fb0a988f':
  riff: IPJ2 decodes with JPEG2000 decoder

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

* commit '9e71cc81':
  movdec: handle 0x7fff langcode as macintosh per the specs

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

* commit '8a0bc405':
  libspeex: support ZygoAudio (quality 10 mode)

Conflicts:
	libavformat/isom.c

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

* commit '360022bd':
  isom: lpcm in mov default to big endian

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

* commit 'db32f14c':
  isom: add "MNG" FourCC

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

* commit '073cd30f':
  isom: Support MPEG-2 video mov files from FPC5

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

* commit '31e558fb':
  isom: add "NO16" FourCC

Conflicts:
	libavformat/isom.c

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

* commit '65090123':
  isom: add Radius DV YUV FourCCs

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

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

* commit 'eeae8585':
  isom: Support Sony XAVC in mov

See: 5b9f3986
See: 6e65e348Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c0980468':
  isom: add xd51 hdcam

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

* commit '4d33873c':
  hevc: make pps/sps ids unsigned where necessary

Conflicts:
	libavcodec/hevc.h
	libavcodec/hevc_ps.c

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

* commit 'ed06e5d9':
  hevc: Do not turn 32bit timebases into negative numbers

Conflicts:
	libavcodec/hevc.c

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

* commit '6cc94e97':
  hevc: use av_mallocz() for allocating tab_ipm

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

* commit '920c01ad':
  hevc: Use get_bits_long() in decode_vui()

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