* commit 'ee59f054':
  intrax8: Have function signature match across declaration and definition
Merged-by: Clément Bœsch <cboesch@gopro.com>

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

This commit is a noop, see 76f43cbeMerged-by: Clément Bœsch <cboesch@gopro.com>

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

This commit is a noop, see 68caef9dMerged-by: Clément Bœsch <cboesch@gopro.com>

* commit '2e55e26b':
  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>

grep -L is not posix, solaris default grep does not support it
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

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

* commit 'e3fb74f7':
  lavfi: Always propagate hw_frames_ctx through links
Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>

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

* commit '7433feb8':
  lavfi: Make default get_video_buffer work with hardware frames
Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>

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

* commit '2025d378':
  doc: Turn off noisy deprecation warnings in the option printer
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'f4ca8ea9':
  rtmpproto: Restructure zlib code to avoid unreachable code warning
Merged-by: Clément Bœsch <u@pkh.me>

* commit 'baab87c4':
  bink: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <u@pkh.me>

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

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.

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

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

* commit '4cf2ffb7':
  idct: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <u@pkh.me>

* commit '39cea657':
  aactab: Move extern keyword to the front of array declarations
Merged-by: Clément Bœsch <u@pkh.me>

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

This commit is mostly a noop, see:
d9e2aceb
6d7aa437Merged-by: Clément Bœsch <u@pkh.me>

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

This commit is a noop, see 8c4753f7Merged-by: Clément Bœsch <u@pkh.me>

* commit '8191f960':
  examples/decode_video: constify the AVCodec instance
Merged-by: Clément Bœsch <u@pkh.me>

* commit '5b4d7ac7':
  examples/encode_video: use the AVFrame API for allocating the frame
Merged-by: Clément Bœsch <u@pkh.me>

Consistent with other examples.

* commit 'd0a603a5':
  examples/encode_video: set the framerate
Merged-by: Clément Bœsch <u@pkh.me>