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>

Merge commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d'

* commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d':
  hwcontext_qsv: transfer data through the child context when VPP fails

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

Merge commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68'

* commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68':
  hwcontext_qsv: do not fail when download/upload VPP session creation fails

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

Merge commit 'b115a35ea62b8f479b48d99a601f0e157517301e'

* commit 'b115a35ea62b8f479b48d99a601f0e157517301e':
  hwcontext_qsv: add support for the P8 format

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

avcodec/atrac3: Check init_get_bits8() for failure

This is more for correctness than actually fixing a missing error path

Fixes CID1399967

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

avfilter/avf_abitscope: Correct range for framerate

Signed-off-by: Gyan Doshi <gyandoshi@gmail.com>
Signed-off-by: Paul B Mahol <onemda@gmail.com> (via IRC)

doc/examples/encode_audio: Favor a sample rate close to 44khz instead of the maximum sample rate

This is an example, people will copy and use this. The maximum supported is quite
unreasonable as a default choice

Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

ffmpeg: Fix avframe memleak

Fixes CID1401674

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

avformat/mux: Check return code of av_packet_split_side_data()

Fixes CID1403225

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

doc/examples/filtering_audio: switch to new decoding API

doc/examples/filtering_video: switch to new decoding API

doc/codecs: add jedec-p22

avformat/nut: Add HEVC and Opus support

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

Merge commit '10065d9324c2e35ce7040b6a2b9ebf6079bcbf42'

* commit '10065d9324c2e35ce7040b6a2b9ebf6079bcbf42':
  hwcontext_dxva2: add support for the P8 format

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

Merge commit '910973765417f06a4a9ccbd006e4df74c32ecb01'

* commit '910973765417f06a4a9ccbd006e4df74c32ecb01':
  hwcontext_dxva2: frame mapping support

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

Merge commit 'fabfbfe5710050812147f93a351a53fdda56ff8c'

* commit 'fabfbfe5710050812147f93a351a53fdda56ff8c':
  dxva2: fix surface selection when compiled with both d3d11va and dxva2

This commit is a noop, see 153b36fc62849e0e1540a43829794e0503994ebb

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

Merge commit 'db0b3dccb3842de134721e8d5c275f56d384340d'

* commit 'db0b3dccb3842de134721e8d5c275f56d384340d':
  libx265: Add option to force IDR frames

This commit is a noop, see 8a8902f2213b28a8dab1520bd42e88e5073f1f59

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

Merge commit '3cba09e5228c889d63814dc43bc68f15c9dbac77'

* commit '3cba09e5228c889d63814dc43bc68f15c9dbac77':
  x86: Drop stray semicolons after function definitions

This commit is a noop, they are already fixed in FFmpeg.

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

Merge commit 'd1ef1b9eaa45043ea5df5a004fb37243e05da61d'

* commit 'd1ef1b9eaa45043ea5df5a004fb37243e05da61d':
  configure: Silence lld-link when getting the version number

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

Merge commit '392caa65df3efa8b2d48a80f08a6af4892c61c08'

* commit '392caa65df3efa8b2d48a80f08a6af4892c61c08':
  arm: vp9mc: Insert a literal pool at the middle of the file

This commit is a noop, see 68caef9d48c4f1540b1b3181ebe7062a3417c62a

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

Merge commit '8ad9f9d675eab139aa2208722009eeed981460dd'

* commit '8ad9f9d675eab139aa2208722009eeed981460dd':
  hwcontext_vaapi: Frame mapping support

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

Merge commit '124e26971e69bb25f38c6c7cb3fa20c77cf10966'

* commit '124e26971e69bb25f38c6c7cb3fa20c77cf10966':
  lavfi: Hardware map filter

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

Merge commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0'

* commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0':
  hwcontext: Hardware frame mapping

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

Merge commit '67351924fa91dea4339109100a4c0689f006581f'

* commit '67351924fa91dea4339109100a4c0689f006581f':
  Drop unreachable break and return statements

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

Merge commit '99434f4df81b6801b2b535d5b9143305595784f6'

* commit '99434f4df81b6801b2b535d5b9143305595784f6':
  float_dsp: Have implementation match function pointer prototype

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

Merge commit '6354957a95022864746180525680cca872ab0e0a'

* commit '6354957a95022864746180525680cca872ab0e0a':
  dnxhdenc: Have function pointer prototype match implementation

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

Merge commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6'

* commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6':
  pixblockdsp: Have function pointer prototype match implementation

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

Merge commit '99ddeddc7fc996c0c1e842112928490e78542bd5'

* commit '99ddeddc7fc996c0c1e842112928490e78542bd5':
  ituh263dec: Have function signature match across declaration and definition

This commit is a noop, see 2d2b363c652403ac0bda129912e1910aacdaa3fc

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

Merge commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481'

* commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481':
  vf_hwupload_cuda: Fix build error

This commit is a noop, see 78e871ebbcc6f3c877e7292c4dda0c9979f8ede4

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

Merge commit '13fcdfb976038f63b9f753e2ebcc8e04d7c7abc2'

* commit '13fcdfb976038f63b9f753e2ebcc8e04d7c7abc2':
  svq3: Drop unused function dctcoef_get()

This commit is a noop, see 1e298e77240099aa45bb8c955ee0313392227f42

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

Merge commit 'ee59f0540875ab42496af2aacddd942757707683'

* commit 'ee59f0540875ab42496af2aacddd942757707683':
  intrax8: Have function signature match across declaration and definition

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

Merge commit '1a469a5e423bdad779b8534247dea8cc86169b88'

* commit '1a469a5e423bdad779b8534247dea8cc86169b88':
  options_table: Remove a now unnecessary include of config.h

This commit is a noop, see 76f43cbe2648ac5cb0e5a146f7e843310002199a

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

Merge commit 'ffbd1d2b0002576ef0d976a41ff959c635373fdc'

* commit 'ffbd1d2b0002576ef0d976a41ff959c635373fdc':
  arm: vp9: Add NEON optimizations of VP9 MC functions

This commit is a noop, see 68caef9d48c4f1540b1b3181ebe7062a3417c62a

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

Merge commit '2e55e26b40e269816bba54da7d0e03955731b8fe'

* commit '2e55e26b40e269816bba54da7d0e03955731b8fe':
  vp9: Flip the order of arguments in MC functions

This commit is a noop, it was made to match our prototypes.

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

tests/fate/source-check: Use git grep in place of grep

grep -L is not posix, solaris default grep does not support it

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

avfilter: Add AV_OPT_FLAG_FILTERING_PARAM where it is missing

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

ffprobe: fix printing packet side data information

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

Merge commit 'e3fb74f7f9a8f1895381355f40c92cac3c1023d9'

* commit 'e3fb74f7f9a8f1895381355f40c92cac3c1023d9':
  lavfi: Always propagate hw_frames_ctx through links

Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>

Merge commit '7e2561fa8313982aa21f7657953eedeeb33b210d'

* commit '7e2561fa8313982aa21f7657953eedeeb33b210d':
  lavfi: Use ff_get_video_buffer in all filters using hwframes
  vf_hwupload_cuda: Fix build error

Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>

avcodec/exr: add support for uint32

Merge commit '7433feb82f75827884d909de34d341a1c4401d4a'

* commit '7433feb82f75827884d909de34d341a1c4401d4a':
  lavfi: Make default get_video_buffer work with hardware frames

Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>

lavfi/signature: fix -Wformat warnings raised by DJGPP

This was forgotten due to the non-gpl build used in 549045254.

Merge commit '2025d3787158ba272a1b8fbc0493fa20dd7a8484'

* commit '2025d3787158ba272a1b8fbc0493fa20dd7a8484':
  doc: Turn off noisy deprecation warnings in the option printer

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

Merge commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6'

* commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6':
  rtmpproto: Restructure zlib code to avoid unreachable code warning

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

Merge commit 'baab87c4f30e75ea309294b06adcd01ce678bdc5'

* commit 'baab87c4f30e75ea309294b06adcd01ce678bdc5':
  bink: Have function pointer prototype match implementation

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

lavc/idctdsp: use prefix restrict with av_

lavc/pthread_slice: remove pointless condition

Fix all -Wformat warnings raised by DJGPP

lavu/mem: clamp alignment to 16 for DJGPP

See also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80208

lavfi/xbr: undef PI if defined

This conflict with the DJGPP libc math.h which includes a PI macro (to
M_PI).

We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this
kind of symbols conflicts due to the lack of both posix_memalign and
memalign (DJGPP non standard function) in that POSIX mode. We currently
rely on memalign for aligned heap allocation.

lavfi/psnr: rename pow2 to pow_2

This conflict with the DJGPP libc which includes a pow2 function¹

We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this
kind of symbols conflicts due to the lack of both posix_memalign and
memalign (DJGPP non standard function) in that POSIX mode. We currently
rely on memalign for aligned heap allocation.

[1]: http://www.delorie.com/djgpp/doc/libc-2.02/libc_536.html

lavfi/dynaudnorm: rename pow2 to pow_2

This conflict with the DJGPP libc which includes a pow2 function¹

We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this
kind of symbols conflicts due to the lack of both posix_memalign and
memalign (DJGPP non standard function) in that POSIX mode. We currently
rely on memalign for aligned heap allocation.

[1]: http://www.delorie.com/djgpp/doc/libc-2.02/libc_536.html

lavc: use av_fourcc2str() where appropriate

lavf: use av_fourcc2str() where appropriate

lavf/ape: remove unused magic field

ffmpeg_videotoolbox: fix usage of av_get_codec_tag_string()

ffprobe: fix usage of av_get_codec_tag_string()

tools/fourcc2pixfmt: fix usages of av_get_codec_tag_string()

lavf: fix usages of av_get_codec_tag_string()

lavc: fix usages of av_get_codec_tag_string()

lavc: deprecate av_get_codec_tag_string()

lavu: add av_fourcc_make_string() and av_fourcc2str()

Merge commit '4cf2ffb7c45840b09bc49e34da88d4053dd442cb'

* commit '4cf2ffb7c45840b09bc49e34da88d4053dd442cb':
  idct: Have function pointer prototype match implementation

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

Merge commit '39cea6570c11a49b64b2ec8d71e218db03b4c742'

* commit '39cea6570c11a49b64b2ec8d71e218db03b4c742':
  aactab: Move extern keyword to the front of array declarations

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

Merge commit '85baef4ff1512bcc2544928bfa5f42072903a691'

* commit '85baef4ff1512bcc2544928bfa5f42072903a691':
  vf_drawtext: Move static keyword to beginning of variable declaration

This commit is mostly a noop, see:
d9e2aceb7f1c712a52672129ca7971872b030e1e
6d7aa437e1108dd8142ae5b850a00c109f95f07f

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

Merge commit '636515c324facaa14ccd8ab0732740a240a31ba9'

* commit '636515c324facaa14ccd8ab0732740a240a31ba9':
  examples/decode_video: remove a stray unrelated comment

This commit is a noop, see 8c4753f7f5f1f65532e841cffa3b4fdb368c2fdf

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

Merge commit '8191f960a669819db4de33a2439ded1630b8a73e'

* commit '8191f960a669819db4de33a2439ded1630b8a73e':
  examples/decode_video: constify the AVCodec instance

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

Merge commit '5b4d7ac7ae5d821cfa6ab89f8eab4d31851ef32c'

* commit '5b4d7ac7ae5d821cfa6ab89f8eab4d31851ef32c':
  examples/encode_video: use the AVFrame API for allocating the frame

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

doc/examples/{de,en}code_audio: fix includes

Consistent with other examples.

Merge commit 'd0a603a534a0ee4b255e5e72742428a7f7f42b83'

* commit 'd0a603a534a0ee4b255e5e72742428a7f7f42b83':
  examples/encode_video: set the framerate

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

Merge commit 'e02524025bce2c8bf8b5bffd96479785c75a70d4'

* commit 'e02524025bce2c8bf8b5bffd96479785c75a70d4':
  examples/encode_video: constify the AVCodec instance

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

Merge commit '7b1f03477f1a43d2261fbd83e50a4ad90c7f806d'

* commit '7b1f03477f1a43d2261fbd83e50a4ad90c7f806d':
  examples/avcodec: split the remaining two examples into separate files

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

Merge commit '90265814f993098d79b0a0f40745ecdb403fbf56'

* commit '90265814f993098d79b0a0f40745ecdb403fbf56':
  examples/decode_audio: constify the AVCodec instance

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

doc/examples/encode_audio: add missing return

Merge commit 'f5df897c4b61985e3afc89ba1290649712ff438e'

* commit 'f5df897c4b61985e3afc89ba1290649712ff438e':
  examples/avcodec: split audio decoding into a separate example

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

Merge commit 'f76698e759a08e8d3b629c06edb0439f474e7fee'

* commit 'f76698e759a08e8d3b629c06edb0439f474e7fee':
  examples/encode_audio: use the AVFrame API for allocating the data

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

Merge commit 'c00a11ab383ff276a2ab2fdba577945e48d465be'

* commit 'c00a11ab383ff276a2ab2fdba577945e48d465be':
  examples/encode_audio: constify AVCodec instances

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

Merge commit '40aaa8dadfd1c69ff4460d04750e1403b5535a6d'

* commit '40aaa8dadfd1c69ff4460d04750e1403b5535a6d':
  examples/avcodec: split audio encoding into a separate example

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

pthread_frame: minor simplification to error handling

Get rid of the "ret" variable, and always use err. Report the packet as
consumed if err is unset. This should be equivalent to the old code,
which obviously required err=0 for p->result>=0 (and otherwise,
p->result must have had the value err was last set to). The code block
added by commit 32a5b631267 is also not needed anymore, because the new
code strictly returns err if it's >=0.

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>

avcodec/ac3dsp: add special-case handling for the C downmix_fixed function

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

fate: add tests for ac3_fixed 5.1 downmix

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

aarch64/vp9dsp: add missing header includes

pthread_frame: don't sync items between threads for intra-only codecs.

Intra-only codecs should either be able to read these items from the
bitstream, or they should be set upon codec initialization. In both
cases, syncing these items at runtime is unnecessary.

In practice, this fixes race conditions for decoders that read these
values from the bitstream.

hevc: initialize no_rasl_output_flag in hevc_frame_start().

This prevents a race condition in files with multiple slices per frame.

h264: revert 1189af429211ac650aac730368a6cf5b23756605.

The patch introduces race conditions.

vp9: split out generic decoding skeleton interface API from VP9 types.

This allows vp9dsp.h to only include the VP9 types header, and not the
decoder skeleton interface which is for hardware decoders (dxva2/vaapi).

vp9: split out reconstruction functions in their own source file.

vp9: split out loopfilter functions in their own source file.

vp9: re-split the decoder/format/dsp interface header files.

The advantage here is that the internal software decoder interface is
not exposed to the DSP functions or the hardware accelerations.

lavfi: fix race when func rets holder is NULL

If ret is NULL, a dummy common holder is created to hold *all* the
parallel function returns, which gets written concurrently. This commit
simplify the whole logic by simply not writing to that holder when not
set.

avdevice/decklink: deprecate @mode syntax in device name to specify mode

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

avdevice/decklink_enc: convert to std::atomic

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

configure: use c++11 and fallback to c++0x for c++ files

Needed for the C+11 atomics. Also change add_cxxflags to check_cxxflags.

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

doc/examples/transcoding: convert to codecpar

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

dirac: make initialization of arithmetic coder tables threadsafe.