Signed-off-by: Paul B Mahol <onemda@gmail.com>

* commit 'f3ed4849':
  h264_mp4toannexb_bsf: do not fail on annex B extradata
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

And simplify and explain the expression.

Fault introduced in f3fdef10Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '5fca95c8':
  libx264: Forbid inverted Stereo3D mode
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '9e2af0e9':
  libx264: Allow Stereo3D monoscopic value
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'a08b5d7b':
  build: Silence the lcov-reset target
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '75b90ef7':
  libavformat: Update the comment about AVOutputFormat flags
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '74383def':
  movenc: Handle pts == NOPTS when autoflushing
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '0abb07ba':
  movenc: Update a comment to reflect how the code actually behaves
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is purposely skipped because it doesn't work very well
with what our img2enc.c supports.

* commit '79fdbfdb':
  img2enc: Refactor the atomic renaming code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'f3fdef10':
  ape: Avoid undefined behaviour
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op.

* commit '6b2ad3ca':
  indeo3: Avoid undefined behaviour
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'eae2ebde':
  libxvid: Create extradata in init using a dummy frame
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '785bfb1d':
  pixfmt: fix wrong comment
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '06edef3d':
  Generate the lists of enabled protocols/bsfs from configure.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Fixes the following warning / error:
libavcodec/libutvideoenc.cpp:281:1: warning: narrowing conversion of ‘3221258240u’ from ‘unsigned int’ to ‘int’ inside { } is ill-formed in C++11 [-Wnarrowing]

Fixes ticket #5542.

Commit message by commiter
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

This was missed during 96d61605 because
it is not included in FATE.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

The loops are guaranteed to be at least multiples of 8, so this
unrolling is safe but allows exploiting execution ports.

For int32 version: 68 -> 58c.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'a0f469da':
  hwcontext: initialize sw_format in av_hwframe_ctx_alloc()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '5e1a3ea3':
  lavc: move the vaapi encoders further down in the list of codecs
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

These are all trivial to merge.

* commit '92fdea37':
  vaapi_h265: Add -qp option, use it to replace use of -global_quality
  vaapi_h265: Add constant-bitrate encode support
  vaapi_h264: Add encode quality option (for quality-speed tradeoff)
  vaapi_h264: Add -qp option, use it to replace use of -global_quality
  vaapi_encode: Add support for codec-local options
  vaapi_h264: Add constant-bitrate encode support
  vaapi_encode: Refactor slightly to allow easier setting of global options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '18019f8c':
  FATE: add an H.264 test with unescaped extradata
  FATE: add an H.264 test with invalid reference lists
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '9d4d9be5':
  libavcodec: Document that encoders may use the framerate field in AVCodecContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '1bb56abb':
  omx: Add support for zerocopy input of frames
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'f1cd9b03':
  omx: Add support for broadcom OMX on raspberry pi
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'e8919ec4':
  libavcodec: Add H264/MPEG4 encoders based on OpenMAX IL
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'b8e899f4':
  mmaldec: Use imgutils.h for copying frames
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '798845ce':
  testprogs: Add missing libm.h includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit 'd12b5b2f':
  build: Split test programs off into separate files

Some conversions done by: James Almer <jamrial@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This fixes build on MSVC and conforms to the usual init style used.

* commit '330177b5':
  build: Group declarations for hw-accelerated de-/encoding separately
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

For some unknown reason enabling these causes propper CBR padding,
so as there are no known downsides just always enable them in CBR mode.

Signed-off-by: James Almer <jamrial@gmail.com>

Leaking this private structure opens up the possibility that it may
be re-used when parsing later packets in the stream. This is
problematic if the later packets are not the same codec type (e.g.
private allocated during Vorbis parsing, but later packets are Opus
and the private is assumed to be the oggopus_private type in
opus_header()).
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>