Merge commit 'ffe89e1edb0281ff65d1bda88253784e9283b717'

* commit 'ffe89e1edb0281ff65d1bda88253784e9283b717':
  configure: Move mjpeg_vaapi_decoder dependency declarations to the right place

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56'

* commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56':
  golomb: Replace __PRETTY_FUNCTION__ with __func__ for tracing

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit 'fbd1f7639d0142c391bec85d1d840c835210843f'

* commit 'fbd1f7639d0142c391bec85d1d840c835210843f':
  af_asyncts: Use llabs instead of labs for 64-bit variable

This commit is a noop, see a8fe8d6b4a35c95aa94fccde5f001041278d197c

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit 'e0b164576f7467b7b1127c18175e215dc1df011f'

* commit 'e0b164576f7467b7b1127c18175e215dc1df011f':
  qsv: Add VP8 decoder

Merged-by: Clément Bœsch <u@pkh.me>

configure: Fix GPL dependency for avisynth / avxsynth.

Merge commit '182cf170a544bce069c8690c90b49381150a1f10'

* commit '182cf170a544bce069c8690c90b49381150a1f10':
  vp8: Return stream format information from parser

Return codes are adjusted to consume the whole packet in case of error
as the API does not allow returning AVERROR codes (a negative return
value is valid).

Merged-by: Clément Bœsch <u@pkh.me>

avutil/avstring: add av_strreplace API into avstring

refer to: http://creativeandcritical.net/str-replace-c
add av_strreplace API for replace string operations.

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>

x86/hevc_add_res: merge last remaining changes from 3d6535983282bea542dac2e568ae50da5796be34

See https://lists.libav.org/pipermail/libav-devel/2016-October/079829.html

doc/libav-merge: link to the relevant ml thread in the extract_extradata line

fate/exr : add test for uint32 data

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

Merge commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8'

* commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8':
  qsv: Add VC-1 decoder

See fb57bc6c34b979bec995e714162fdfb4caf6db1a.
Merged for cosmetic purposes to reduce differences with libav.

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

Merge commit 'fea4dc05b41f5465bedc786b67966f204ec6150c'

* commit 'fea4dc05b41f5465bedc786b67966f204ec6150c':
  vc1: Return stream format information from parser

This commit is a noop, see 4df6605da7e351116c99f19b8a98e1f236932600

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

Merge commit '0940b748bdba36c4894fc8ea6be631d821fdf578'

* commit '0940b748bdba36c4894fc8ea6be631d821fdf578':
  qsvdec: Only warn about unconsumed data if it happens more than once

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

Merge commit '030d84fa2e35af0e77516735de35bf1a52371c86'

* commit '030d84fa2e35af0e77516735de35bf1a52371c86':
  qsvdec: Pass field order information to libmfx
  qsvdec: Pass the correct profile to libmfx

These commits are a noop, see 1f26a231bb065276cd80ce02957c759f3197edfa

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

Merge commit '3297577f3eac1c87d48dedd527942de2bd28e7a5'

* commit '3297577f3eac1c87d48dedd527942de2bd28e7a5':
  mpegvideo: Return correct coded frame sizes from parser

This commit is a noop, see 309fe16a126c6c00cc60070de3190cf23f5570fb

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

Merge commit '31756abe29eb039a11c59a42cb12e0cc2aef3b97'

* commit '31756abe29eb039a11c59a42cb12e0cc2aef3b97':
  aarch64: vp9: loop_filter: fix typo in skip flatout8 check
  aarch64: vp9: Implement NEON loop filters
  arm: vp9itxfm: Simplify txfm string comparisons

These commits are a noop, see
b4dc7c341eb08b6a4d5470a05364eadf85434108
f1212e472b5f57b4f7243fc46f254647cf7e284d

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

Merge commit '3c9546dfafcdfe8e7860aff9ebbf609318220f29'

* commit '3c9546dfafcdfe8e7860aff9ebbf609318220f29':
  aarch64: vp9: Add NEON itxfm routines

This commit is a noop, see f43079e11cb445e6b70b149d9cdb829091ec2155

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

doc/decode_audio: use <> to include libav* headers

Found-by: ubitux

Merge commit '01348e411f962f5e4605d649fc9a47a54587ba8e'

* commit '01348e411f962f5e4605d649fc9a47a54587ba8e':
  avconv_opt: Consistently iterate through hwaccels array in all cases

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

Merge commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6'

* commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6':
  Drop pointless void* casts

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

Merge commit 'd316f9cefcd854071985c6f524a9a15348240264'

* commit 'd316f9cefcd854071985c6f524a9a15348240264':
  aac: Drop pointless cast

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

Merge commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67'

* commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67':
  vf_drawtext: Drop wrong void* cast

This commit is a noop, see 4c96985af1b8870482b6b6ef9120960633f62cee

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

Merge commit 'fcbdd605b5409103c3f4bfa063ea270f2229b125'

* commit 'fcbdd605b5409103c3f4bfa063ea270f2229b125':
  nut: Use correct function pointer casts instead of void*

This commit is a noop. Casts are not needed.

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

Merge commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e'

* commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e':
  ratecontrol: Use correct function pointer casts instead of void*

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

Merge commit 'dd299a2d6d4d1af9528ed35a8131c35946be5973'

* commit 'dd299a2d6d4d1af9528ed35a8131c35946be5973':
  arm: vp9: Add NEON loop filters

This commit is a noop, see 6bec60a683a530ac3bf5a19e5c3d087b5dd047a1

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

Merge commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e'

* commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e':
  libxvid: Check return value of write() call

This commit is a noop, see 25f35df11583800ee296effd42c51c65e9f3ef72

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

Merge commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9'

* commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9':
  libxvid: Use proper context in av_log() calls

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

Merge commit '12db2832e41aa71b5903ef7fa5c59c5473ded2c5'

* commit '12db2832e41aa71b5903ef7fa5c59c5473ded2c5':
  libxvid: Require availability of mkstemp()

This commit is a noop. Our libxvid wrapper doesn't use mkstemp().

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

Merge commit 'a67ae67083151f2f9595a1f2d17b601da19b939e'

* commit 'a67ae67083151f2f9595a1f2d17b601da19b939e':
  arm: vp9: Add NEON itxfm routines

This commit is a noop, see b4dc7c341eb08b6a4d5470a05364eadf85434108

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

Merge commit '0b37cd09a67c3ba4db044404b99c65a32b4ad932'

* commit '0b37cd09a67c3ba4db044404b99c65a32b4ad932':
  checkasm: add vp9dsp.itxfm_add tests.

This commit is a noop, see 0b227c6d4725d580feeea7d04c07bee26600df1b

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

Merge commit 'fd0fae60372cddbe0bec8830d07e760195f80bad'

* commit 'fd0fae60372cddbe0bec8830d07e760195f80bad':
  pthread_frame: Unreference hw_frames_ctx on per-thread codec contexts

This commit is a noop, see fb69a8e1f124ee89e924344bfb7934937abed642

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

Merge commit '11623217e3c9b859daee544e31acdd0821b61039'

* commit '11623217e3c9b859daee544e31acdd0821b61039':
  arm: vp9mc: Use a different helper register for PIC loads

This commit is a noop, see 68caef9d48c4f1540b1b3181ebe7062a3417c62a

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

Merge commit '824e8c284054f323f854892d1b4739239ed1fdc7'

* commit '824e8c284054f323f854892d1b4739239ed1fdc7':
  arm: Clear the gp register alias at the end of functions

This commit is a noop, see 86c5a23ee5236aa0996435247a2141ac90fc491e

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

Merge commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b'

* commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b':
  examples/decode_audio: Add missing header for av_free()

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

Merge commit '6a62795d4051f435a9a2c59395d96913693922f8'

* commit '6a62795d4051f435a9a2c59395d96913693922f8':
  aarch64: h264idct: Use the offset parameter to movrel

This commit is a noop, see da5c8284c02c4ccc3596bc52d54a10166708094f

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

Merge commit '557c1675cf0e803b2fee43b4c8b58433842c84d0'

* commit '557c1675cf0e803b2fee43b4c8b58433842c84d0':
  arm: vp9mc: Minor adjustments from review of the aarch64 version

This commit is a noop, see 68caef9d48c4f1540b1b3181ebe7062a3417c62a

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

Merge commit '383d96aa2229f644d9bd77b821ed3a309da5e9fc'

* commit '383d96aa2229f644d9bd77b821ed3a309da5e9fc':
  aarch64: vp9: Add NEON optimizations of VP9 MC functions

This commit is a noop, see 1f7801c2bc93811df4daf09b839572bc4c8b3524

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

doc/libav-merge: mention aac_adtstoasc extradata update fix for matroska

Merge commit 'c44a8a3eabcd6acd2ba79f32ec8a432e6ebe552c'

* commit 'c44a8a3eabcd6acd2ba79f32ec8a432e6ebe552c':
  aarch64: Add an offset parameter to the movrel macro

This commit is a noop, see 7fe898dbb949f0e31665d716f671e2428d50bb29

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

Merge commit 'a4cfcddcb0f76e837d5abc06840c2b26c0e8aefc'

* commit 'a4cfcddcb0f76e837d5abc06840c2b26c0e8aefc':
  vp9: Make the subpel filters non-static

This commit is a noop.

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

Merge commit '98cae966c77875e26c5958206a6cfe7eba6269e8'

* commit '98cae966c77875e26c5958206a6cfe7eba6269e8':
  matroskaenc: write updated STREAMINFO metadata for FLAC streams if available

This commit is a noop, see 8c1342e631d635f6cad13f9374c4f2005c22b9e5

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

Merge commit 'f4bf236338f6001736a4784b9c23de863057a583'

* commit 'f4bf236338f6001736a4784b9c23de863057a583':
  matroskaenc: fix muxing AAC streams when using aac_adtstoasc bsf

This commit is a noop. aac_adtstoasc bsf sends its extradata update
straight to codecpar->extradata.
This behavior violates the bsf API and should be fixed so this change
may then be applied.

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

Merge commit '84f225684cd389747907381122c073aa1c8b6bf1'

* commit '84f225684cd389747907381122c073aa1c8b6bf1':
  pthread_frame: properly propagate the hw frame context across frame threads

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

Merge commit '72a19f4013ec2c7f8581416f8ad4bf81df163fb6'

* commit '72a19f4013ec2c7f8581416f8ad4bf81df163fb6':
  mpegaudiodsp: aarch64: Adjust function prototype after 2caa93b813adc5dbb7771dfe615da826a2947d18

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

Merge commit '2dd464868c64fa21a6e3bd63ad364ff12999c7d0'

* commit '2dd464868c64fa21a6e3bd63ad364ff12999c7d0':
  configure: Move license checks directly after command line parsing

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

Merge commit 'c78495d1cdac6dd13786a7e5571b606604a360bd'

* commit 'c78495d1cdac6dd13786a7e5571b606604a360bd':
  configure: Log name and parameters of all helper functions where it makes sense

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

Merge commit '8a6e7a67cb2943f552569801539829a304971302'

* commit '8a6e7a67cb2943f552569801539829a304971302':
  configure: Use check_cpp in CPP flags tests

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

Merge commit '831005b2302cbeb377e3f00fd18c78928bcec185'

* commit '831005b2302cbeb377e3f00fd18c78928bcec185':
  configure: Log correct test name and use correct filter when testing objective C flags

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

Merge commit 'fe7bc1f16abaefe66d8a20f734ca3eb8a4ce4d43'

* commit 'fe7bc1f16abaefe66d8a20f734ca3eb8a4ce4d43':
  configure: Do not unconditionally check for (and enable) xlib

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

ffprobe: use av_spherical_projection_name() to print spherical projection names

Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

avformat/dump: use av_spherical_projection_name() to print spherical projection names

Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

avutil/spherical: add av_spherical_projection_name()

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

lavf/amr: Return AVERROR_EOF on EOF.

Fixes ticket #6280.

doc/libav-merge: remove line about AC3 fixed decoder speedup

It was addressed in commit 91ccd38c0befb17d788c1621d1d4362dc1c40bd6

h264: only assign H264Picture::mbaff for first slice.

The value must be identical between slices, since mbaff depends on
picture_structure and sps, both of which are checked to be identical
to the first slice before this point.

In practice, this silences some tsan warnings in fate-h264.

h264: don't write to source picture object in ff_h264_ref_picture().

Doing so is analogous to writing to source data in memcpy(), and causes
(harmless) tsan warnings in fate-h264.

lagarith: assign correct per-thread value to LagarithContext::avctx.

This fixes race conditions reported by tsan in fate-lagarith. The races
were because each thread's LagarithContext::avctx was set to the first
thread's AVCodecContext.

fic: set pict_type/key_frame after (instead of during) slice decoding.

This fixes a race condition that was already documented in the source
code, and is also reported by tsan in fate-fic-avi.

codec_desc: mark fraps as an intra-only codec.

Fixes reported race conditions by tsan in fate-avio-direct.

dnxhd: initialize DNXHDContext::avctx to each thread's respective one.

Otherwise all thread's private contexts have the avctx pointer set to
the AVCodecContext of the first thread, which means all writes to
ctx->avctx->* (in e.g. read_header) are effectively race conditions.

Fixes fate-dnxhd under tsan.

lavf/mov.c: Add -advanced_editlist option for mov format.

Adding an MOV format option to turn on/off the editlist supporting code, introduced in https://github.com/FFmpeg/FFmpeg/commit/ca6cae73db207f17a0d5507609de12842d8f0ca3

Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Bump minor versions for master after release/3.3 branchpoint

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

Bump minor versions for staring release/3.3 branch

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

doc/APIchanges: Update

avfilter/avfiltergraph: Check for allocation failure in avfilter_graph_queue_command()

Fixes: CID1396538
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/vf_zoompan: Free out frame on error

Fixes: CID1398578
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/mips: fix build

Found-by: Shivraj Patil <shivraj.patil@imgtec.com>
Suggested-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

configure: remove redundant info

Based on d1a91ebe4990001e0800ee9ac54ed2207e4f56ff

Merge commit 'd1a91ebe4990001e0800ee9ac54ed2207e4f56ff'

* commit 'd1a91ebe4990001e0800ee9ac54ed2207e4f56ff':
  configure: Print list of enabled programs

This commit is mostly a noop, see 832b4a4a438b73d720878d77aa3db46b08d79937

Merged-by: Clément Bœsch <cboesch@gopro.com>

Merge commit '576c9003aef0fe18c0cf8da6e865211610552005'

* commit '576c9003aef0fe18c0cf8da6e865211610552005':
  configure: Improve output wording

Merged-by: Clément Bœsch <cboesch@gopro.com>

Merge commit 'a3483f79933e8f1fd99d524e3218688e14c59150'

* commit 'a3483f79933e8f1fd99d524e3218688e14c59150':
  avconv: Drop stray leftover debug output

This commit is a noop, see a283665693e1c9804b2736545dba77d0ee342f9e

Merged-by: Clément Bœsch <cboesch@gopro.com>

Merge commit '67deba8a416d818f3d95aef0aa916589090396e2'

* commit '67deba8a416d818f3d95aef0aa916589090396e2':
  Use avpriv_report_missing_feature() where appropriate

Merged-by: Clément Bœsch <cboesch@gopro.com>

Merge commit '59d2b00d201935c16408a2917957d89a170fe58f'

* commit '59d2b00d201935c16408a2917957d89a170fe58f':
  configure: Add --quiet command line parameter to suppress informative output

The license assignment is moved out of the quiet condition to make sure
it ends up in config.h

Merged-by: Clément Bœsch <cboesch@gopro.com>

Merge commit '4537647c0429fe7c8ee655ac3fda856ba67f58a0'

* commit '4537647c0429fe7c8ee655ac3fda856ba67f58a0':
  fate: checkasm: Split monolithic test into individual components

Merged-by: Clément Bœsch <cboesch@gopro.com>

Merge commit '9498237049d15812cecb79df47b196c73013908b'

* commit '9498237049d15812cecb79df47b196c73013908b':
  checkasm: Add --test parameter to check only specific components

Merged-by: Clément Bœsch <cboesch@gopro.com>

Merge commit 'de6e2ff3ddf506d5b487c2f226cea73e095ad6d1'

* commit 'de6e2ff3ddf506d5b487c2f226cea73e095ad6d1':
  mov: Read multiple stsd from DV

This commit is a noop, see a765ba647d3d5ecb7270011693cb5b171f9afd01

Merged-by: Clément Bœsch <cboesch@gopro.com>

Merge commit '47a795727f5433f5238a8a244cf181f61ea5af2c'

* commit '47a795727f5433f5238a8a244cf181f61ea5af2c':
  hevc: Support extradata changes from multiple stsd

This commit is a noop, see 25fcbf7a84a485ae358f3fb3519ed4e8a98459cd

Merged-by: Clément Bœsch <cboesch@gopro.com>

Merge commit '2fe30b4743c0f4c3bdf37b91ae534cafa85e4036'

* commit '2fe30b4743c0f4c3bdf37b91ae534cafa85e4036':
  hevc: Allow parsing external extradata buffers

This commit is a noop as it matches FFmpeg state.

Merged-by: Clément Bœsch <cboesch@gopro.com>

Merge commit '5be21531119d7a97ebc706800d1608272ee5a507'

* commit '5be21531119d7a97ebc706800d1608272ee5a507':
  hevc: Move hevc_decode_extradata before frame decoding

This commit is a noop, hevc_decode_extradata() is already above
hevc_decode_frame().

Merged-by: Clément Bœsch <cboesch@gopro.com>

Merge commit 'bed2c4b2652b1412b584e5545d6dd2ef8c613be0'

* commit 'bed2c4b2652b1412b584e5545d6dd2ef8c613be0':
  lavc: Add hevc main10 profile to avconv cli

This commit is a noop, see 271afd632f4de87db99ec085e75446b648dc6e60

Merged-by: Clément Bœsch <cboesch@gopro.com>

Merge commit '17dac56b8fdd80c594c39b76de3f27a7949afbde'

* commit '17dac56b8fdd80c594c39b76de3f27a7949afbde':
  lavu: Rename ycgco color space appropriately

Merged-by: Clément Bœsch <cboesch@gopro.com>

Merge commit '0361e4dcb4d394c88c33364415a3b8fe315b67d1'

* commit '0361e4dcb4d394c88c33364415a3b8fe315b67d1':
  h264_qpel: x86: Move function with only one instance out of template macro

Note: warning is present with clang.

Merged-by: Clément Bœsch <cboesch@gopro.com>

pthread_frame: Propagate sw_pix_fmt across threads

This is required by the VP9 hwaccels (both DXVA2 and VAAPI) when
threads are enabled.

Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>

avutil/tests/dict: Check return of av_dict_parse_string()

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

avformat/mov: Init ref_sc / ref_st to NULL

This is more robust in case some change or corner case causes them to be
dereferenced before being set

Fixes CID1396274, CID1396275

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

avformat/libopenmpt: Check for avio_size() failure

Fixes CID1396850

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

avfilter/af_chorus & aecho: Handle NULL return from av_strtok()

Fixes CID1396260

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/clearvideo: Do not lose the return code of decode_mb()

Fixes CID1401671

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301'

* commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301':
  avplay: Correct function pointer assignments in options array

This commit is a noop, see a9a1bc56abf1fa79104996bf7b98b12ca42cd32c

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '943533d64c7fa7a1b2fc9559e67652c349d21d51'

* commit '943533d64c7fa7a1b2fc9559e67652c349d21d51':
  avconv: Correct function pointer assignments in options array

This commit is a noop, see 4c96985af1b8870482b6b6ef9120960633f62cee

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '43de8b328b62cf21ec176c3989065168da471a5f'

* commit '43de8b328b62cf21ec176c3989065168da471a5f':
  lzf: update pointer p after realloc

This commit is a noop, see bb6a7b6f75ac544c956e3eefee297700ef4d3468

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c'

* commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c':
  swscale: Add GRAY12

This commit is a noop, see 19be5fb7286b02fbe384f12fe4aa5c376d43d2e1

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '7471352f1915813cda725ce624607d84b5a3a61c'

* commit '7471352f1915813cda725ce624607d84b5a3a61c':
  pixfmt: Add GRAY12

This commit is a noop, see 638b216d4f54a330d0fad6cc7e1f4ec066594abe

Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '4ab61cd983b539749bd621ea271624ddb5196a8e'

* commit '4ab61cd983b539749bd621ea271624ddb5196a8e':
  qsv{enc,dec}: extend the internal frame allocator

Merged-by: Mark Thompson <sw@jkqxz.net>

Merge commit '00aeedd84105a17f414185bd33ecadebeddb3a27'

* commit '00aeedd84105a17f414185bd33ecadebeddb3a27':
  qsv{dec,enc}: use a struct as a memory id with internal memory allocator

Merged-by: Mark Thompson <sw@jkqxz.net>

Merge commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c'

* commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c':
  qsv{dec,enc}: always use an internal mfxFrameSurface1

Minor fixups for differences in the QSV encoder because of a53cc.

Merged-by: Mark Thompson <sw@jkqxz.net>

Merge commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6'

* commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6':
  hwcontext_qsv: support frame mapping

Merged-by: Mark Thompson <sw@jkqxz.net>

avfilter/vf_minterpolate: Use dx and dy

Fixes CID1396283 and CID1396284

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

avfilter/deshake_opencl: Remove redundant return

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

avfilter/af_sofalizer: Fix bad shift

Fixes CID1396835

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