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

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

Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

Fixes ticket #2630.

Reviewed-by: Marton Balint

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Needed for dithering S32
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Should make no difference, but future commits will need it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* lukaszmluki/master:
  ftp: fix using uninitialized value
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Fix coverity issue CID 1026777
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Fixes CID732197/6

A assert is added to check that the disabled code wont
be needed in the future.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Closes #2634.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

* 'master' of https://github.com/upsuper/ffmpeg-vdadec:
  vda_h264_dec: remove check_format
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

av_freep() is safer as it zeros the pointer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

Fixes: CID1026772/3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Tha fate tests change because the edge mirroring was wrong before this commit
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

10% faster
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

67935 -> 29984 kcycles
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  movenc: Change the track struct name to match the typedef
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2d66a58c':
  Go2Webinar decoder

Conflicts:
	Changelog
	configure
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h
	libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '31980b6a':
  vmd: decode videos with no LZ buffer size provided - they might not need it

Conflicts:
	libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0aed0bfc':
  vmd: fix mode 3 decoding

Conflicts:
	libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c011ceef':
  swscale: ppc: Remove commented-out define cruft
  nsvdec: Remove commented-out debug cruft
  cpu: Restructure code to avoid pointless ret variable indirection

Conflicts:
	libavutil/cpu.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '46ce9ded':
  tiff: K&R formatting cosmetics

Conflicts:
	libavcodec/tiff.c
	libavcodec/tiff.h
	libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This makes the struct name (which isn't used anywhere) match the
name of the typedef, as for all the other structs declared in this
header.
Signed-off-by: Martin Storsjö <martin@martin.st>