* commit '91767360':
  a64multienc: Do not entangle coded_frame

Conflicts:
	libavcodec/a64multienc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '95e2317e':
  roqvideoenc: Drop unneeded initialization

Conflicts:
	libavcodec/roqvideoenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '1f171de8':
  mpegvideo_enc: Drop unnneded initialization
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

They are not available on some compilers.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

~20% faster than ssse3. Also enabled for x86_32
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

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

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

The C functions return uint8/16_t but that is effectively int not unsigned int
Fixes fate-filter-tblend

We do not return uint8/16_t as that would require the compiler to truncate the
values, slowing it down.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Add fixed poind code.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Create tables for fixed point code.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Move the existing code to a new template file.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>

Signed-off-by: Donny Yang <work@kota.moe>

This change (and the following ones of the same kind) is mainly to
simplify wrapping this section with an #if FF_API block later on.

No functional changes are applied, the fields of the context coded_frame
fields are directly initialized, instead of keeping a reference to the
coded_frame itself.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Its fields are never initialized to begin with.

coded_frame is already initialized where needed.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

Should fix compilation with vs2012
Signed-off-by: James Almer <jamrial@gmail.com>

* commit 'e93ca480':
  parseutil: Add more resolution aliases

Conflicts:
	doc/ffmpeg.texi
	libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Add DCI 2k and 4k and uhd1 and uhd2.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes: genio-avi
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Both may be set by user (libavformat) on decoding.

Fixes Ticket4665
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes Ticket4664

The changed fate tests lack red/blue shades and thus look correct
either way
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: James Almer <jamrial@gmail.com>

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

Signed-off-by: Chris Spencer <spencercw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

* commit '69b92f1b':
  qsvenc: properly handle asynchronous encoding

Conflicts:
	libavcodec/qsvenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

* commit 'f5c4d38c':
  qsvdec: properly handle asynchronous decoding

Conflicts:
	libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>