jpeg2000: Mark static data init functions as av_cold
Merge commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785'

* commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785':
  jpeg2000: Mark static data init functions as av_cold

Conflicts:
	libavcodec/jpeg2000.c
	libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tiffenc: fix packet size calculation

Signed-off-by: Anton Khirnov <anton@khirnov.net>
flvenc: Don't over-count metadata.

Over-counting occurs if framerate is not set.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
vp9 encoder: use a decent default speed setting

Signed-off-by: Anton Khirnov <anton@khirnov.net>
vf_sab: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/vf_spp: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '49106844929b7b71ac719064d640f8aa56c89b1f'

* commit '49106844929b7b71ac719064d640f8aa56c89b1f':
  tiffenc: fix packet size calculation

Conflicts:
	libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47'

* commit '74bc9458057f07c0820c3d3264396c4c64442e47':
  flvenc: Don't over-count metadata.

Conflicts:
	tests/ref/lavf/flv_fmt
	tests/ref/vsynth/vsynth1-flashsv
	tests/ref/vsynth/vsynth1-flv
	tests/ref/vsynth/vsynth2-flashsv
	tests/ref/vsynth/vsynth2-flv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '9affa784a0743b95bde135b5acfce2183afc35d8'

* commit '9affa784a0743b95bde135b5acfce2183afc35d8':
  vp9 encoder: use a decent default speed setting

Conflicts:
	libavcodec/libvpxenc.c

See: 34e32d6464135a03da14d5b0aef1d42796939eae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
presets: remove moldering iPod presets

* Some users are trying to use them for non-ancient iDevices when
  baseline profile and level 1.3/3.0 would not be required.

* "640" and "320" no longer make sense.

* Some recommended options can be viewed at:
  <https://trac.ffmpeg.org/wiki/Encode/H.264#iOS>

Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/wavpack: fix () in macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/vp9: fix () in macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/vp8: fix () in macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
swresample/audioconvert: fix () in FMT_PAIR_FUNC()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/cavsdec: simplify % 512 operations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
swscale/swscale: replace potentially slow % by &

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge https://github.com/ffmpeg/ffmpeg