* commit '0539d84d':
  asfdec: Account for different Format Data sizes

See 76853a3eMerged-by: James Almer <jamrial@gmail.com>

* commit '871b4f36':
  configure: Check for xcb as well as xcb-shape before enabling libxcb

This commit is a noop. We already check for libxcb_shape.
Merged-by: James Almer <jamrial@gmail.com>

* commit 'b446f0e9':
  mov: Do not try to parse multiple stsd for the same track

See 8b43ee40Merged-by: James Almer <jamrial@gmail.com>

* commit 'e791b915':
  hwcontext_vaapi: Try to support the VDPAU wrapper

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

* commit '5dd9a4b8':
  vaapi: Implement device-only setup

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

* commit '44f2eda3':
  lavc: Add device context field to AVCodecContext

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

* commit '07b5136c':
  aarch64: vp9lpf: Fix broken indentation/vertical alignment
  aarch64: vp9lpf: Interleave the start of flat8in into the calculation above
  arm: vp9lpf: Interleave the start of flat8in into the calculation above

This commit is a noop, see
83399cf5
9f3a8863
c8d6eec8Merged-by: James Almer <jamrial@gmail.com>

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

* commit '9c2d36fc':
  dv: 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 'ba30b746':
  aac: Validate the sbr sample rate before using the value

See cf5f4c51Merged-by: James Almer <jamrial@gmail.com>

* commit '0ee78020':
  configure: Move up the avbuild directory creation

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

* commit 'c2f97f05':
  hwcontext_dxva2: support D3D9Ex

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

* commit '04f3bd34':
  AVFrame: add an opaque_ref field

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

* commit '4de220d2':
  frame: allow align=0 (meaning automatic) for av_frame_get_buffer()

See https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.htmlMerged-by: James Almer <jamrial@gmail.com>

* commit 'f44ec22e':
  lavc: use av_cpu_max_align() instead of hardcoding alignment requirements

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

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

* commit 'e6bff23f':
  cpu: add a function for querying maximum required data alignment

Adapted to work with the arbitrary runtime cpuflag changes av_force_cpu_flags()
can generate.
Merged-by: James Almer <jamrial@gmail.com>

* commit '5c8a5765':
  scale_npp: explicitly set the output frames context for passthrough mode

See 62b75537Merged-by: James Almer <jamrial@gmail.com>

* commit '6f554521':
  Use the new AVIOContext destructor.
  avio: add a destructor for AVIOContext

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

* commit '435cd7bc':
  arm: vp9lpf: Use orrs instead of orr+cmp
  arm/aarch64: vp9lpf: Calculate !hev directly
  aarch64: vp9itxfm: Optimize 16x16 and 32x32 idct dc by unrolling
  arm: vp9itxfm: Optimize 16x16 and 32x32 idct dc by unrolling
  aarch64: vp9mc: Calculate less unused data in the 4 pixel wide horizontal filter
  arm: vp9mc: Calculate less unused data in the 4 pixel wide horizontal filter
  aarch64: vp9mc: Simplify the extmla macro parameters

This commit is a noop, see
ac6cb8ae
bff07715
045e33ae
758302e4
148cc0bb
f0ecbb13
92ab8374Merged-by: James Almer <jamrial@gmail.com>

* commit '53ea595e':
  mov: Rework stsc index validation

See e26e6240.
Merged-by: James Almer <jamrial@gmail.com>

* commit 'ce6d72d1':
  imgutils: Document av_image_get_buffer_size()
Merged-by: James Almer <jamrial@gmail.com>

* commit 'b6093e8c':
  hlsenc: Correctly write down all 16 bytes in hex

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

* commit 'bc258976':
  utvideodec: Add a missing include

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

* commit 'a52976c0':
  nvenc: make gpu indices independent of supported capabilities

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

* commit '77c23704':
  avcodec: Mark some codecs with threadsafe init as such

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

Their previous positioning would cause them to chosen before software
encoders like libx264 or libvpx.

* commit '0c0b87f1':
  aarch64: vp9itxfm: Fix incorrect vertical alignment
  aarch64: vp9itxfm: Update a comment to refer to a register with a different name
  aarch64: vp9itxfm: Use the right lane sizes in 8x8 for improved readability
  aarch64: vp9itxfm: Use a single lane ld1 instead of ld1r where possible
  aarch64: vp9itxfm: Share instructions for loading idct coeffs in the 8x8 function
  arm: vp9itxfm: Share instructions for loading idct coeffs in the 8x8 function
  aarch64: vp9itxfm: Do separate functions for half/quarter idct16 and idct32
  arm: vp9itxfm: Do a simpler half/quarter idct16/idct32 when possible
  aarch64: vp9itxfm: Move the load_add_store macro out from the itxfm16 pass2 function
  arm: vp9itxfm: Move the load_add_store macro out from the itxfm16 pass2 function
  aarch64: vp9itxfm: Make the larger core transforms standalone functions
  arm: vp9itxfm: Make the larger core transforms standalone functions

This commit is a noop, see
f8fcee0d
dc47bf38
3bd9b391
a681c793
82458955
9532a7d4
1d8ab576
3006e525
19a0f952
6752318c
d0fbf7f3
16ef0007Merged-by: James Almer <jamrial@gmail.com>

Fixes checkheaders.

* commit 'c546147d':
  configure: Correctly recurse in do_check_deps()

See 7659f356.
Merged-by: James Almer <jamrial@gmail.com>

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