Regression since git 71ef1ec7.

* commit 'f223ad1e':
  doc: document the prores encoder options
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '93e65e9a':
  Cosmetics, restore alphabetic order in atomics lists.

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

This filter is not required anymore with aformat. Drop it at next bump.

This is heavily based on 2831b307 by Anton Khirnov <anton@khirnov.net>

* commit '9e6b5e61':
  img2enc: add an option for overwriting one file with subsequent images

Conflicts:
	doc/muxers.texi
	libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

In particular, show h value in degrees.

This also drops support for "flat syntax" and "reinit" command.

"reinit" command is not very robust and complicates the logic more than
necessary, since requires to reset all the options in the command.

*This is a syntax break*.

Parts of this commit are based on: 4fa1f52eSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes an overflow of the sample count field within the audio stream header
chunk if audio stream data exceeds 2GB.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Similar to 937325f3.

The ',' separator is deprecated with aformat, and thus causes various
arnings when transcoding audio.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is the last remaining issue from ticket #2412
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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>

* qatar/master:
  Move misplaced file author information where it belongs

Conflicts:
	libavcodec/adpcm.c
	libavcodec/adpcmenc.c
	libavcodec/gif.c
	libavcodec/x86/dsputilenc_mmx.c
	libavcodec/x86/fmtconvert_init.c
	libavformat/au.c
	libavformat/gif.c
	libavformat/mov.c
	libavformat/nsvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9de9b828':
  lavc: don't overwrite display dimensions with coded dimensions.
  lavc: extend / update the [coded_]{width,height} doxy

Conflicts:
	libavcodec/avcodec.h
	libavcodec/utils.c

The change to the w/h handling is not merged as it breaks lowres
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The filter doesn't take any option and thus works with the new system.

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

* commit '20429ba9':
  h261: Move encoder/decoder shared table init to common code
Merged-by: Michael Niedermayer <michaelni@gmx.at>