avformat: Add av_cold attributes to init functions missing them
avcodec: Add av_cold attributes to end functions missing them
bgmc: Do not mark ff_bgmc_decode_init() as av_cold

The function is possibly called once per block.
nut: use a define for the nut version

Ease switching version in the future and make evident why that value.
wav: Always seek to an even offset

RIFF chunks are aligned to 16bit according to the specification.

Bug-Id:500
CC:libav-stable@libav.org
Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

* commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43':
  avformat: Add av_cold attributes to init functions missing them

Conflicts:
	libavformat/rtpdec_xiph.c

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

* commit 'bd8ac882140a38868c33c000a430a1292a352533':
  avcodec: Add av_cold attributes to end functions missing them

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

* commit '46c1917350f58dfab84e41919e6c02d43950db8c':
  nut: use a define for the nut version
  bgmc: Do not mark ff_bgmc_decode_init() as av_cold

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wav: Always seek to an even offset

Conflicts:
	libavformat/wavdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
wav_seek_tag: fix integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
x86: More specific ifdefs for dsputil/hpeldsp init functions
x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled
x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c

The function is only instantiated once, so there is no point
in keeping it in a template file.
lavfi/unsharp: fix opencl crash on 64bit linux

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavu/opencl_internal: use av_opencl_errstr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavfi/unsharp_opencl: use av_opencl_errstr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Remove a superfluous include from libavcodec/options_table.h.
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Remove a superfluous include from libavcodec/options_table.h.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck

Signed-off-by: Diego Biurrun <diego@biurrun.de>
lavfi/deshake_opencl: use ff_opencl_set_parameter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>