* commit '967cd6fa':
  libopenjpegdec: stop using deprecated avcodec_set_dimensions
  kgv1dec: stop using deprecated avcodec_set_dimensions
  ivi_common: stop using deprecated avcodec_set_dimensions
  indeo3: stop using deprecated avcodec_set_dimensions

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

* commit '3b086317':
  h26[13]dec: stop using deprecated avcodec_set_dimensions
  gifdec: stop using deprecated avcodec_set_dimensions
  g2meet: stop using deprecated avcodec_set_dimensions

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

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

This reverts commit fc5fe480, reversing
changes made to ffe33500.

The factoring is broken; it's not calling the ssse3 code anymore, and
calling the mmx2 code with bad alignment. It also broke some FATE
instances.

Conflicts:
	libavfilter/x86/vf_gradfun_init.c

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

* commit 'ec706300':
  eatqi: stop using deprecated avcodec_set_dimensions
  eatgv: stop using deprecated avcodec_set_dimensions
  eatgq: stop using deprecated avcodec_set_dimensions
  eamad: stop using deprecated avcodec_set_dimensions

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

* commit 'd6da3729':
  eacmv: stop using deprecated avcodec_set_dimensions
  dvdsubdec: stop using deprecated avcodec_set_dimensions
  dvdec: stop using deprecated avcodec_set_dimensions
  dpx: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/dpx.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/eacmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c7a5acab':
  dnxhddec: stop using deprecated avcodec_set_dimensions
  dirac: stop using deprecated avcodec_set_dimensions
  cdxl: stop using deprecated avcodec_set_dimensions
  avs: stop using deprecated avcodec_set_dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '78780c8b':
  ansi: stop using deprecated avcodec_set_dimensions

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

* commit '0f6c1d6d':
  lavc/utils: stop using deprecated avcodec_set_dimensions

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

* commit 'ce6949d3':
  oggparsetheora: stop using deprecated avcodec_set_dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7644f5a8':
  lavc: replace avcodec_set_dimensions with ff_set_dimensions

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

This is a separate commit to ease future bisecting in case it breaks something.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '28096e0a':
  h264: wait for initial complete frame before outputing frames

Conflicts:
	doc/APIchanges
	libavcodec/h264.c
	libavcodec/mpegvideo.h
	libavutil/frame.h
	libavutil/version.h

See: a64b028a (as well as various later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Partially based on the https://trac.ffmpeg.org/wiki/AACEncodingGuide
guide.

* commit '9af7a852':
  HNM4/HNM4A demuxer & video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ed1a11ed':
  gradfun: x86: Factor out common code for some gradfun_filter_line() variants

Conflicts:
	libavfilter/x86/vf_gradfun_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ee80cf74':
  avfilter: x86: K&R formatting cosmetics

Conflicts:
	libavfilter/x86/vf_gradfun_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>