* commit 'c0f4c7db':
  configure: move the hardware accel libs' entries in the help text
Merged-by: Clément Bœsch <u@pkh.me>

* commit '5e220344':
  configure: improve the help text for external libraries

Only merged the explanation paragraphs. The removal of "enable/disable"
and "[no]" would create too much inconsistency and might cause
confusion.
Merged-by: Clément Bœsch <u@pkh.me>

* commit '0d95d88f':
  lavc: revert the Makefile part of 330177b5Merged-by: Clément Bœsch <u@pkh.me>

Fixes #4124: Invalid argument '-std=c99' not allowed with 'C++/ObjC++'
C++ files fail to compile. This adds '-std=c++11' to CXX_FLAGS to fix.
Signed-off-by: Rick Kern <kernrj@gmail.com>

This commit fixes a broken build when compiling libavcodec with LLVM
compiler. These assembly files use non-standard format that is only
supported by GCC compiler. It would be nice to use a common standard
format. With this patch, both GCC and LLVM can build and generate the
same objects.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes assertion failures in movenc
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

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

* commit 'ded4a654':
  xtea-test: Use struct allocation functions from the API
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit '8131bd4c':
  blowfish-test: Use struct allocation functions from the API
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit 'a86ef804':
  blowfish-test: Return different values for different errors
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit 'b84f3a40':
  movenc: Write 'loci' geotag metadata for 3gp and mp4
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit 'f12a705e':
  movenc: Factorize a function for finding a metadata entry and the associated language
Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit 'daec1651':
  movenc: Write ?xyz geotag metadata for mov files

This commit is a noop, see a3ec1d6aMerged-by: Clément Bœsch <clement@stupeflix.com>

* commit 'bc431319':
  mov: Also export loci altitude

This commit is a noop, see 08b7d19dMerged-by: Clément Bœsch <clement@stupeflix.com>

* commit '94d8141c':
  mov: Append place name instead of overwriting for loci

This commit is a noop, see 1607f774Merged-by: Clément Bœsch <clement@stupeflix.com>

* commit 'f126365c':
  mov: Fix parsing short loci

This commit is a noop, see 50393bceMerged-by: Clément Bœsch <clement@stupeflix.com>

* commit '704d2bd1':
  mov: Print reason of loci parsing failure

See 9e4f0cfcMerged-by: Clément Bœsch <clement@stupeflix.com>

* commit 'd34826c3':
  mov: Add a comment referring to the standard that defines the loci box
Merged-by: Clément Bœsch <clement@stupeflix.com>

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>

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

* commit '72d62106':
  movenc: Add a missed const
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

* commit 'a79aafd0':
  movenc: Add a test for VFR with b-frames, with a duration change at a fragment end
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

* commit 'e1eb0fc9':
  movenc: Use packets in interleaving queues for the duration at the end of fragments
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

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

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

This is definitely not complete.

Anton, Diego and Luca are still maintaining their code in Libav, but are
unwilling to do so in FFmpeg, so removing these entries will prevent
them from getting poked by our users.

Måns, Justin, Kostya and Jason left both projects a while ago.

* commit 'fd4957d9':
  movenc-test: Test write_data_type
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

* commit '71852a1b':
  matroskaenc: Provide output bytestream markers
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

Fixes regression since 5d48e4ea

* commit 'dbbaad32':
  movenc: Provide output bytestream markers for fragmented content
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

* commit '371df9ba':
  flvenc: Provide output bytestream markers
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

* commit 'db7968bf':
  avio: Allow custom IO users to get labels for the output bytestream
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>

Increase buffer dequeue timeout when the codec needs to be drained as it
could happen that no input buffer is available when we receive a null
packet for the first time (meaning we are unable to signal end of stream
and mark the codec as draining).

Fixes potential loss of last frames after sending a null packet.

Their only purpose is to carry the end of stream flag.

Based on 8e757716

See https://github.com/mpv-player/mpv/issues/1045 for mk3d
elektranox.org samples.