* commit '57ec83e4':
  omx: Use the EOS flag to handle flushing at the end
Merged-by: James Almer <jamrial@gmail.com>

* commit 'dad7a9c7':
  configure: Rework dependency handling for conflicting components

Includes an important fix made by c546147d
as well.
Merged-by: James Almer <jamrial@gmail.com>

This adds hardware decoding for H.264 / HEVC / VP8 / VP9 using the MPP
Rockchip API.  It returns frames holding an AVDRMFrameDescriptor struct
in buf[0] that allows drm / dmabuf usage.  Tested on RK3288 (TinkerBoard)
and RK3328.
Signed-off-by: Mark Thompson <sw@jkqxz.net>

* commit '9127ac5e':
  configure: Add name parameter to require_pkg_config() helper function
Merged-by: James Almer <jamrial@gmail.com>

Remove loops and unroll as block sizes are known.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Replace generic with block size specific function.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Replace generic with block size specific function.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This reverts commit 1985071e, reversing
changes made to a901869c.

We autodetect libxcb, so this is not necessary.

Support for this device has been removed in kernel since v2.6.37. dv1394 has been superseded by libiec61883 which is functionally equivalent.
Signed-off-by: Josh de Kock <josh@itanimul.li>
Signed-off-by: wm4 <nfxjfg@googlemail.com>

* commit 'a25dac97':
  Use bitstream_init8() where appropriate

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

* commit '71a49fe2':
  configure: Use cppflags check helper functions where appropriate
Merged-by: James Almer <jamrial@gmail.com>

* commit '0ce3761c':
  configure: Add stdlib.h #include to CPPFLAGS check helper functions
Merged-by: James Almer <jamrial@gmail.com>

Metadata filter output is passed through an Awk script comparing floats
against reference values with specified "fuzz" tolerance to account for
architectural differences (e.g. x86-32 vs. x86-64).
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>

* commit 'f7ec7f54':
  wma: 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 '58d87e0f':
  aarch64: vp9itxfm: Restructure the idct32 store macros
  arm: vp9itxfm: Avoid .irp when it doesn't save any lines

This commit is a noop, see
31e41350
52c7366cMerged-by: James Almer <jamrial@gmail.com>

This reverts commit 740e557d, reversing
changes made to 932e28b1.

The commit apparently broke builds with shared libs, and "suggesting"
the use of external libraries that need to be explicitly enable has
dubious usefulness anyway.

* commit '8e67039c':
  asfdec: Use the ASF stream count when iterating
Merged-by: James Almer <jamrial@gmail.com>

* 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>