* commit '7abdd026':
  asm: Consistently uppercase SECTION markers
Merged-by: James Almer <jamrial@gmail.com>

* commit '740b0bf0':
  build: Ignore generated .version files

This commit is a noop, see fbc30423Merged-by: James Almer <jamrial@gmail.com>

* commit '15a92e0c':
  rtmp: Correctly handle the Window Acknowledgement Size packets
Merged-by: James Almer <jamrial@gmail.com>

* commit 'a1a143ad':
  rtmp: Rename packet types to closer match the spec
Merged-by: James Almer <jamrial@gmail.com>

* commit 'bcaedef1':
  configure: Add require_cpp_condition() convenience function
Merged-by: James Almer <jamrial@gmail.com>

* commit 'aba7fdcc':
  configure: Add require_header() convenience function
Merged-by: James Almer <jamrial@gmail.com>

* commit 'a97563c8':
  configure: Simplify libxcb check
Merged-by: James Almer <jamrial@gmail.com>

* commit 'c29da01a':
  svq3: Convert to the new bitstream reader

This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.htmlMerged-by: James Almer <jamrial@gmail.com>

* commit 'acfa7a21':
  configure: Drop weak dependencies on external libraries for webm muxer

This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>

* commit '66988320':
  configure: Add proper weak dependency of drawtext filter on libfontconfig
Merged-by: James Almer <jamrial@gmail.com>

* commit '24d5680b':
  configure: Simplify inline asm check with appropriate helper function
Merged-by: James Almer <jamrial@gmail.com>

* commit 'b3825723':
  configure: Merge compiler/libc/os hacks sections
Merged-by: James Almer <jamrial@gmail.com>

* commit '577326d4':
  lavc: deprecate refcounted_frames field
Merged-by: James Almer <jamrial@gmail.com>

* commit '3ad82579':
  hwcontext_cuda: implement frames_get_constraints

This commit is a noop, c16fe143Merged-by: James Almer <jamrial@gmail.com>

* commit 'fd9212f2':
  Mark some arrays that never change as const.
Merged-by: James Almer <jamrial@gmail.com>

* commit 'b420a27e':
  avconv: allow -b to be used with streamcopy

This commit is a noop. We already have this functionality.
Merged-by: James Almer <jamrial@gmail.com>

* commit 'ab2539bd':
  ffv1: Convert to the new bitstream reader
  h261dec: Convert to the new bitstream reader
  shorten: Convert to the new bitstream reader
  ralf: Convert to the new bitstream reader
  loco: Convert to the new bitstream reader
  fic: Convert to the new bitstream reader
  dirac: Convert to the new bitstream reader
  cavs: Convert to the new bitstream reader
  aic: Convert to the new bitstream reader
  golomb: Convert to the new bitstream reader

This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.htmlMerged-by: James Almer <jamrial@gmail.com>

* commit 'ab87af41':
  configure: Add proper weak dependency of avformat on network
Merged-by: James Almer <jamrial@gmail.com>

* commit '612cc071':
  pgssubdec: reset rle_data_len/rle_remaining_len on allocation error

This commit is a noop, see 842e98b4Merged-by: James Almer <jamrial@gmail.com>

* commit '708e84cd':
  mov: Avoid memcmp of uninitialised data
Merged-by: James Almer <jamrial@gmail.com>

* commit 'ca62236a':
  vaapi_encode: Add VP8 support
  vaapi_encode: Pass framerate parameters to driver
  vaapi_h264: Enable VBR mode
  vaapi_encode: Support VBR mode

This commit is a noop, see
ceb28c3c
2201c02e
be6546a4
d1acab82Merged-by: James Almer <jamrial@gmail.com>

* commit 'c5c66354':
  doc: add dash muxer
Merged-by: Rodger Combs <rodger.combs@gmail.com>

* commit '7295b737':
  dashenc: add webm support
Merged-by: Rodger Combs <rodger.combs@gmail.com>

* commit '01f1f017':
  dashenc: use avio_dynbuf instead of packet_write callback
Merged-by: Rodger Combs <rodger.combs@gmail.com>

* commit 'dce2929e':
  dashenc: copy language and role metadata from streams assigned to sets
Merged-by: Rodger Combs <rodger.combs@gmail.com>

* commit 'ca9bc9de':
  dashenc: default to one AdaptationSet per stream
Merged-by: Rodger Combs <rodger.combs@gmail.com>

* commit 'efd2fc41':
  dashenc: allow assigning all streams of a media type to an AdaptationSet
Merged-by: Rodger Combs <rodger.combs@gmail.com>

* commit '3d23a5f9':
  dashenc: add support for assigning streams to AdaptationSets
Merged-by: Rodger Combs <rodger.combs@gmail.com>

* commit '9df9309d':
  dashenc: calculate stream bitrate from first segment if not available
Merged-by: Rodger Combs <rodger.combs@gmail.com>

This reverts commit 89c0fda5.

A different solution will be committed instead.
Signed-off-by: James Almer <jamrial@gmail.com>

The GnuTLS version is checked through the macro GNUTLS_VERSION_NUMBER,
but this wasn't introduced before 2.7.2. Building with older versions
of GnuTLS (using icc) warns:

src/libavformat/tls_gnutls.c(38): warning #193: zero used for undefined preprocessing identifier "GNUTLS_VERSION_NUMBER"
  #if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00

This adds a fallback to the older, deprecated LIBGNUTLS_VERSION_NUMBER
macro.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>

Commit 598e4168 added use of
GNUTLS_E_PREMATURE_TERMINATION, which wasn't introduced to GnuTLS
before 2.99.x / 3.x. This fixes compilation with older versions.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>

Fixes #6649.

It's unnecessary after a call to av_packet_ref().
Signed-off-by: James Almer <jamrial@gmail.com>

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

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

It does the same thing as av_packet_ref().
Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: Thomas Mundt <tmundt75@gmail.com>

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

Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>