Merge commit '79331df362fb05a0d04ca9489c87e5b80077a3f4'

* commit '79331df362fb05a0d04ca9489c87e5b80077a3f4':
  rtsp: Lazily set up the pollfd array once

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

Merge commit 'd8f36a6aa33e9f904fa47caa0329ddaac391cd7d'

* commit 'd8f36a6aa33e9f904fa47caa0329ddaac391cd7d':
  nvenc: Fix the preset mapping list

This commit is a noop.

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

Merge commit '698ac8f9cabd053f2c19346a77b92f8eae4218fc'

* commit '698ac8f9cabd053f2c19346a77b92f8eae4218fc':
  fate: Make null comparison method more useful

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

Merge commit 'c483398bb7ef66f61ed2dcb09f3d6160683da0eb'

* commit 'c483398bb7ef66f61ed2dcb09f3d6160683da0eb':
  build: Drop DOC_ prefix from EXAMPLES-related variables

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

Merge commit '5263f464db5f2df74ddf712f6d1221b24475fa8e'

* commit '5263f464db5f2df74ddf712f6d1221b24475fa8e':
  rtsp: Lazily allocate the pollfd array

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

Merge commit 'b9b82151a1aaa8bbf389853a6142c4e101d80b86'

* commit 'b9b82151a1aaa8bbf389853a6142c4e101d80b86':
  rtsp: Move the pollfd setup out of the for loop

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

Merge commit '150e99d694f33ab9ad678834964909aa315d14a1'

* commit '150e99d694f33ab9ad678834964909aa315d14a1':
  rtsp: Factor out packet reading

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

Merge commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7'

* commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7':
  Use modern avconv syntax for codec selection in documentation and tests

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

avformat/mp3dec: Fix definition of MIDDLE_BITS

The number of bits from bit #m to #n is n - m plus 1.

Signed-off-by: Ingo Brückl <ib@wupperonline.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/dxv: Check for end of input in dxv_decompress_dxt5()

Fixes: Timeout
Fixes: 3291/clusterfuzz-testcase-4630024655208448
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/truemotion2: Fix integer overflows in tm2_high_chroma()

Fixes: runtime error: signed integer overflow: -1408475220 + -1408475220 cannot be represented in type 'int'
Fixes: 3336/clusterfuzz-testcase-minimized-5656839179993088
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/aacdec_template: Clear tns present flag on error

Fixes: 3444/clusterfuzz-testcase-minimized-6270352105668608
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

mpegdec: fix redundant dummy frames issue of interlaced clips

It is to fix https://trac.ffmpeg.org/ticket/6677. Actucally it is a
regression of commit 99e07a4453732058df90885f80b3db3b4f37cb3c which
always inserts a dummy frame when decode the first key field picture.

Signed-off-by: Zhong Li <zhong.li@intel.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'da8093f712d625db7ce4a2526fb52994e01921ec'

* commit 'da8093f712d625db7ce4a2526fb52994e01921ec':
  fate: Use bitexact optimizations in the svq3-2 test

This commit is a noop, see b591329c3afe445c45eaecadd5fe3b80a837ee2f

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

Merge commit '984736dd9e5b50987a5910e22495304e4a6d975c'

* commit '984736dd9e5b50987a5910e22495304e4a6d975c':
  lavc: make sure not to return EAGAIN from codecs

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

Merge commit '4cc0227040adb9efc63be6a5765e3214f5c6f662'

* commit '4cc0227040adb9efc63be6a5765e3214f5c6f662':
  apetag: account for header size if present when returning the start position
  apetag: fix flag value to signal footer presence

This commit is a noop, see
e8d6fef3161f35878f8e0abf9d27d2c45a5d40b6
84d874a680ff647bc84de44967b638f246a8b832

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

Merge commit 'b2788fe9347c02b1355574f3d28d60bfe1250ea7'

* commit 'b2788fe9347c02b1355574f3d28d60bfe1250ea7':
  svq3: fix the slice size check

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

doc: Add mailing list FAQ

Signed-off-by: Lou Logan <lou@lrcd.com>
Reviewed-by: Kieran O Leary <kieran.o.leary@gmail.com>
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>

Merge commit 'cd7a2e1502f174c725c0de82711d2c7649057574'

* commit 'cd7a2e1502f174c725c0de82711d2c7649057574':
  asfdec: fix reading files larger than 2GB

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

Merge commit '248dc5c1646dcdd96fe79761105c4ae889e711fd'

* commit '248dc5c1646dcdd96fe79761105c4ae889e711fd':
  h264dec: fix dropped initial SEI recovery point

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

libavcodec/blockdsp : add AVX version

Also modify the required alignment, to 32 instead of 16
for several codecs

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

lavf/mxfdec: Search all components of material track for source package.

Fixes ticket #5925.

Reviewed-by: Marton

fate: Add a test for latm-in-dvb auto-detection, ticket #6657.

avcodec/proresdec2: Use LAST_SKIP_BITS where possible

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

avcodec/proresdec2: SKIP_BITS() does not work with len=32

Fixes: invalid shift
Fixes: 3482/clusterfuzz-testcase-minimized-5446915875405824
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/hevcdsp_template: Fix undefined shift

Fixes: runtime error: left shift of negative value -255
Fixes: 3373/clusterfuzz-testcase-minimized-5604083912146944
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/encode: do proper cleanup on failure

Fixes the last remaining memleaks introduced by a22c6a4796ca1f2cbee6784262515da876fbec22.

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

avformat/mxfenc: Fix labels for IEC PAL DV 420

avformat/mxfenc: Add IEC DV25

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

build: fix compilation of tools with OpenCL enabled

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

fate: disable fate-svq3-2

The first frame changes depending on --enable-memory-poisoning being
used to configure ffmpeg or not, even if requesting bitexact decoding.
Disable the test until this is fixed.

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

avcodec/encode: free non-referenced packets' side data in the old encode API functions

Fixes memleaks introduced by a22c6a4796ca1f2cbee6784262515da876fbec22.

Merge commit '8e4d4efc67e154fdffd65964a7cfeef740320827'

* commit '8e4d4efc67e154fdffd65964a7cfeef740320827':
  fate: Add another SVQ3 test to increase coverage

Also included a fix from da8093f712d625db7ce4a2526fb52994e01921ec.

The demuxer option "-ignore_editlist 1 " is temporarily added to the
test as well, to workaround a regression in the edit list mov parsing
code.

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

Merge commit 'b8f66c0838b4c645227f23a35b4d54373da4c60a'

* commit 'b8f66c0838b4c645227f23a35b4d54373da4c60a':
  aarch64: vp9itxfm: Reorder iadst16 coeffs
  arm: vp9itxfm: Reorder iadst16 coeffs
  aarch64: vp9itxfm: Reorder the idct coefficients for better pairing
  arm: vp9itxfm: Reorder the idct coefficients for better pairing
  aarch64: vp9itxfm: Avoid reloading the idct32 coefficients
  arm: vp9itxfm: Avoid reloading the idct32 coefficients
  arm: vp9lpf: Implement the mix2_44 function with one single filter pass
  aarch64: vp9lpf: Use dup+rev16+uzp1 instead of dup+lsr+dup+trn1
  arm/aarch64: vp9lpf: Keep the comparison to E within 8 bit

This commit is a noop, see
3fbbad29847c79f422128ad88f174c53a5f6c449
f32690a298badbf2df66319e9b38236ad3d3e321
a88db8b9a016fe47997029e3653cdac4777994b4
600f4c9b03b8d39b986a00dd9dafa61be7d86a72
2905657b902fea8718434f0d29056cf4e7434307
4f693b56bdcfda37b4f2c48b39dcf12439c149c8
f952273019984da5e7bfa1298e1cdb0683049296
b2e20d89844b51c3d9565b293606d1433bd67f25
26ee83acc4ebd765529b666c7f050243b7677d76

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

Merge commit 'ed6a891c364f8b0850b557d9578b8920cc15a937'

* commit 'ed6a891c364f8b0850b557d9578b8920cc15a937':
  Place attribute_deprecated in the right position for struct declarations

This commit is a noop, see
99530387283fc58e6c3ac42724955b8569daf548
6ff3da4f6a8e460d77bb65fed4267bf48f513fcf

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

Merge commit '04d2afa93b6c6f320ac45dd99ce1226f3c3d5ac8'

* commit '04d2afa93b6c6f320ac45dd99ce1226f3c3d5ac8':
  mkv: Update the seek test to match 5d3953a5dc
  fate: Update fate-lavf-mkv after commit 5d3953a5dc

This commit is a noop.

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

Merge commit '156bc0193bd47d3f4b3adaa93be0e206e12686ab'

* commit '156bc0193bd47d3f4b3adaa93be0e206e12686ab':
  fate: Add webp alpha test

This commit is a noop, see
bd2cec7021a0e275d4551a56d0a220ba2f9bd691
2bdb26b4eeec8142c927645a10b7f55cae5cdcc5
92bf87db294c0544168f572ba6739db7d2ba2ba3

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

Merge commit '5d3953a5dcfd5f71391b7f34908517eb6f7e5146'

* commit '5d3953a5dcfd5f71391b7f34908517eb6f7e5146':
  matroskaenc: factor ts_offset into block timecode computation

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

avdevice/decklink_dec: remove av_dup_packet() usage

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: James Almer <jamrial@gmail.com>

avdevice/decklink_dec: use av_packet_add_side_data()

It uses the existing buffer instead of allocating a new one.

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: James Almer <jamrial@gmail.com>

avcodec/encode: remove usage of av_dup_packet()

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

avcodec/avpacket: deprecate av_copy_packet_side_data()

It leaks memory and destroys the dst packet in case of failure, and it
ultimately duplicates functionality already existing in the saner
av_packet_copy_props().

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

Merge commit 'c95169f0ec68bdeeabc5fde8aa4076f406242524'

* commit 'c95169f0ec68bdeeabc5fde8aa4076f406242524':
  build: Move cli tool sources to a separate subdirectory

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

tools/ismindex: remove unused header

libavcodec/exr : add x86 SIMD for predictor

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

lavfi/vmafmotion: Allow more pix_fmts.

avdevice/decklink_dec: Used av_parity instead of duplicated function

Partially revert "Merge commit '71a49fe25f2e4468fbbadbebef8d073b1b3cc1a5'"

Revert back to the test as done by commit af7a75cb517141f649cbbe0a9dcdb4854359b740,
where it was changed to compile and not just preprocess to fix build failures on
FreeBSD with gcc 4.7

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

avfilter/vf_thumbnail_cuda: Avoid mixing declaration and statements

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

avcodec/v4l2_context: Reduce spelling variations

Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/v4l2_buffers: More clear return code documentation

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

avcodec/jpeg2000: Check that codsty->log2_prec_widths/heights has been initialized

Fixes: OOM
Fixes: 2225/clusterfuzz-testcase-minimized-5505632079708160
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

lavf/bit: Fix the G.729 bit auto-detection.

avfilter/vmaf_motion: use correct header guards

Fixes fate-source

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

avfilter: add vmafmotion filter

Signed-off-by: Ashish Singh <ashk43712@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

build: fix cleaning compiled unstripped examples

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

MAINTAINERS: add myself to the general developers list

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

avcodec/hevc_sei: Support HEVC paired fields.

Correctly set the interlaced_frame and top_field_first fields when pic_struct
indicates paired fields.

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

build: add missing changes to ensure examples build with progs-suffix

Merge commit 'ab566cc96bc0c31b34d944214bc06cec8ae8b640'

* commit 'ab566cc96bc0c31b34d944214bc06cec8ae8b640':
  build: Separate logic for building examples from that for building avtools

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

build: don't call install with the -T option

It's not available on macOS.

Should fix a regression instroduced by b25d6290c67e193b91becab12e6c88df134cee81.

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

Merge commit 'acb0dea27efff4b35796015b96570b59fd517078'

* commit 'acb0dea27efff4b35796015b96570b59fd517078':
  build: Split logic for building examples off into a separate Makefile

We already have a Makefile in doc/examples, but it's separate from the build
system and meant to be installed as part of the documentation to help users
compile the installed .c example files.
Move it to Makefile.example to make place for the new build system Makefile.

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

lavf/bit: Use pkt->size instead of a constant for G.729 frame size.

Makes the code more readable, the muxer may support variable bit-rate in the future.

lavf/bit: Only build the G.729 bit demuxer if requested.

Fix the condition for the G.729 bit muxer.

fate: increase fuzz for refcmp filter tests

Should fix failing tests on GNU/kFreeBSD x86_32.

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

configure: fix enabling SDL2 without pkg-config

Regression since d81b34069e80cb04160689ef5a160b9aee858257.

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

avcodec/videotoolbox: add hevc support

Signed-off-by: Aman Gupta <aman@tmm1.net>

avcodec/hevc_ps: extract SPS fields required for hvcC construction

Signed-off-by: Aman Gupta <aman@tmm1.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'db4903eb4875bed6c5b8a4259cdd7bc1768dfdf6'

* commit 'db4903eb4875bed6c5b8a4259cdd7bc1768dfdf6':
  build: Avoid duplication in examples lists

See 1a88e84fd54fd7a9ae334e989a9805f11f327864

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

Merge commit '533339bdcc3b39bbd708c723b3cd0b5898350f0f'

* commit '533339bdcc3b39bbd708c723b3cd0b5898350f0f':
  build: Drop leftover reference to old EXAMPLES logic

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

lavf/mov: Allow reading very large files.

The Sample count in the time-to-sample table is defined as
32-bit unsigned integer by the QT specification.

Fixes ticket #6700.

opus_pvq: make max_den a float

Prevents int->float conversions on every loop.
Performance gain on synthetic benchmarks: 13%.
Suggested by kamedo2.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

Merge commit '7208e5b5d638d4b9c2784036b4fc5728f32233c7'

* commit '7208e5b5d638d4b9c2784036b4fc5728f32233c7':
  configure: Restructure the way check_pkg_config() operates

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

avcodec/decode: Pass on the Closed Captions Side Data

Signed-off-by: Karthick J <kjeyapal@akamai.com>
Signed-off-by: Marton Balint <cus@passwd.hu>

avdevice/decklink_dec: Added Closed caption decode from VANC

Signed-off-by: Karthick J <kjeyapal@akamai.com>
Signed-off-by: Marton Balint <cus@passwd.hu>

avdevice/decklink_dec: Extraction of luma from V210 VANC modularized

In preparation to support multiple VANC data decode

Signed-off-by: Karthick J <kjeyapal@akamai.com>
Signed-off-by: Marton Balint <cus@passwd.hu>

avdevice/decklink_dec: Added VANC search for all resolutions

In preparation to make VANC decode modular, to support multiple other VANC data.

Signed-off-by: Karthick J <kjeyapal@akamai.com>
Signed-off-by: Marton Balint <cus@passwd.hu>

avdevice/decklink_dec: add support for more pixel formats

The decklink input pixel format can now be specified with the 'raw_format'
option. The -bm_v210 option is now deprecated.

Signed-off-by: Marton Balint <cus@passwd.hu>

Merge commit '54e39b102e29adcc2f59f1eca85be5f86c89454b'

* commit '54e39b102e29adcc2f59f1eca85be5f86c89454b':
  configure: Explicitly spell out first require_pkg_config() parameter

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

Merge commit '00b160af117b782292619c98effce6c8273792e5'

* commit '00b160af117b782292619c98effce6c8273792e5':
  nvenc: Fix nvec vs. nvenc typo

This commit is a noop.

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

Merge commit '42cf7f91f1e9dabf494ff469d8f67ac8b33b0f63'

* commit '42cf7f91f1e9dabf494ff469d8f67ac8b33b0f63':
  dv: Don't return EIO upon EOF

This commit is a noop, see 3eae98c1ac705d3f820a1800e81960146a80c61c

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

Merge commit '7cb9296db872c4221453e5411f242ebcfca62664'

* commit '7cb9296db872c4221453e5411f242ebcfca62664':
  webp: Fix alpha decoding

This commit is a noop.

[13:09:40] <jamrial> jkqxz: do we need 7cb9296db8 from libav?
[13:11:20] <+wm4> we had vaapi vp8 for a while in ffmpeg, so I guess not
[13:11:58] <@jkqxz> It's more fallout from the VP8 hwaccel which never got merged. Some people hated on that part of the patch and I wasn't really interested in pursuing it further.
[13:13:02] <jamrial> it wasn't merged?
[13:13:21] <@jkqxz> wm4:  There is no VP8 decode hwaccel in ffmpeg (there is encode).
[13:13:25] <+wm4> ah
[13:14:00] <jamrial> what do i do then? and shouldn't that be merged at some point?
[13:14:37] <@jkqxz> It should.
[13:14:53] <@jkqxz> Skip the patch now, though.
[13:16:30] <jamrial> ok, thanks

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

movenc-test: Add tests for negative cts offsets

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

movenc: Add an option for enabling negative CTS offsets

This reduces the need for an edit list; streams that start with
e.g. dts=-1, pts=0 can be encoded as dts=0, pts=0 (which is valid
in mov/mp4) by shifting the dts values of all packets forward.
This avoids the need for edit lists for such streams (while they
still are needed for audio streams with encoder delay).

This eases conformance with the DASH-IF interoperability guidelines.

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '2d518aec4c781316092be65893b47922c8f71b67'

* commit '2d518aec4c781316092be65893b47922c8f71b67':
  vf_deinterlace_vaapi: Create filter buffer after context
  vaapi_encode: Discard output buffer if picture submission fails

This commit is a noop, see
92bd08974541611731b2d58723826ea26ecbe47d
359586f14f46bf3f9c1ae3375d80e8c0fc377bef

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

Merge commit '8f5de34c8fb18fa1416e77d2cb998773a49ddb3d'

* commit '8f5de34c8fb18fa1416e77d2cb998773a49ddb3d':
  vf_fade: Make sure to not miss the last lines of a frame

This commit is a noop.

[11:00:43] <jamrial> michaelni: what do you think of 8f5de34c8f? does it apply to us?
[11:01:50] <jamrial> our code started to deviate with your commit bca59d7745e, followed by the merge commit aa40df483b2
[11:33:51] <michaelni> jamrial, the fade commits are from 2013, but i think our fixes where complete and the problematic slice_h FFALIGN is also removed

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

Merge commit 'd00a0d8e84fef1b9124bfaf71cc17df79ca464a6'

* commit 'd00a0d8e84fef1b9124bfaf71cc17df79ca464a6':
  configure: Handle SDL version check through pkg-config

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

Merge commit '8847eeaa141898850381400000fb2b8a7adc7100'

* commit '8847eeaa141898850381400000fb2b8a7adc7100':
  aarch64: Add parentheses around the offset parameter in movrel

This commit is a noop, see dda45c087b2c09ba9e485c51ff9c8f2aaca709a9

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

Merge commit '82989bd98c7f4e87f59af2147b645b8fd8f31c53'

* commit '82989bd98c7f4e87f59af2147b645b8fd8f31c53':
  avconv: Move rescale to stream timebase before monotonisation

This commit is a noop, see 4ee5aed122ba7d289c1686eca6eba161d5d62304

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

avcodec/libopenh264dec: check for ff_set_dimensions() return value

Was removed by accident in e9b6212de29a966f200833220ed35f51852f05f6.

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

Merge commit '030de53e9cc225dc767458aedcc87efd457b4f3b'

* commit '030de53e9cc225dc767458aedcc87efd457b4f3b':
  libopenh264dec: Let the framework use the h264_mp4toannexb bitstream filter

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

Merge commit '0539d84d985e811e5989ef27c13f7e2dda0f9b89'

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

See 76853a3e0ce4d4ef09ffcca7307991b8db832cd4

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

Merge commit '871b4f3654636ed64560e86b9faa33828d195ceb'

* commit '871b4f3654636ed64560e86b9faa33828d195ceb':
  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>

Merge commit 'b446f0e98f85e2e931b476e52b319f1c49244660'

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

See 8b43ee4054af799e388d380b379a13a60849c1b5

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

Merge commit 'e791b915c774408fbc0ec9e7270b021899e08ccc'

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

This commit is a noop, see f2e4fb61af4b47c329fbf2b9a245594957d7bbab

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

Merge commit '5dd9a4b88b287bf8c93520afda7becb1ad0d1894'

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

This commit is a noop, see 81b7deab8296f8446a64e20b9fcaf8eba88b9e29

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

Merge commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c'

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

This commit is a noop, see c1a5fca06f75cc0e7b9b2808fecaa0c1b424da50

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

Merge commit '07b5136c481d394992c7e951967df0cfbb346c0b'

* commit '07b5136c481d394992c7e951967df0cfbb346c0b':
  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
83399cf569c9f78e0c72e21aa67184c222bb2d59
9f3a8863648ed19ea69ca5ddfcfa3c80e0df15b0
c8d6eec85d6a87c9075c87d5eb75af47c964fff8

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

doc/libav-merge: mention skipped or incomplete runtime alignment commits

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

Merge commit '9c2d36fcaf8748b9baa9aba9264abefce711d67b'

* commit '9c2d36fcaf8748b9baa9aba9264abefce711d67b':
  dv: Convert to the new bitstream reader

This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

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