* commit 'b08caa87':
  nvenc: H264 and HEVC encoders

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/version.h

This implementation is merged under the name nvenc_b*
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '522d971c':
  xsub: Check memory allocation

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

* commit '83797da6':
  wma: Check memory allocation

See: 8559a714Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e1ea365f':
  truemotion2: Check memory allocation

Conflicts:
	libavcodec/truemotion2.c

See: d49f2603Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '28fb80dc':
  svq1: Check memory allocation

Conflicts:
	libavcodec/svq1enc.c

See: 2a3af772Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '42df71d9':
  ratecontrol: Check memory allocation

Conflicts:
	libavcodec/ratecontrol.c

See: 0898a6d4Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0994e142':
  pthread: Check memory allocation

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

* commit '03927cb7':
  psymodel: Check memory allocation

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

* commit 'fef2f472':
  xvid: Check memory allocation

See: 5c95de15 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9fb483fe':
  x264: Check memory allocation

See: 066dc043 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '41658bc8':
  libtheora: Check memory allocation

Conflicts:
	libavcodec/libtheoraenc.c

See: 67d4d5f5
See: 27216bf3Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8df5fbf0':
  lcl: Check memory allocation

Conflicts:
	libavcodec/lclenc.c

See: 6dbcecd7Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7ca603f9':
  jpegls: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7d2a6826':
  huffyuv: Check memory allocation

See: 4a722a5cMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7fccc96d':
  eatgv: Check memory allocation

Conflicts:
	libavcodec/eatgv.c

See: a5615b82Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '69277069':
  dct: Check memory allocation

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

* commit 'e524f373':
  asv: Check memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '074a1b37':
  aacpsy: Check memory allocation

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

* commit '149fa0b7':
  mpegvideo: Move MotionEstContext and function declarations to a separate header

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

* commit 'b2b76691':
  mpegvideo: mpeg12: Move function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '378a0008':
  mpegvideo: Move tables to a separate file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '31a117a0':
  mpegvideo: msmpeg4: Move function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2f15846a':
  mpegvideo: wmv2: Move function declarations

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

* commit '902a55f7':
  dxva2_hevc: re-write reference frame handling

See: 902a55f7Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '35818b8a':
  dxva2_hevc: fix 32x32 scaling lists

See: b7a0b303Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5c720657':
  mov: always check avio_read return value

Conflicts:
	libavformat/mov.c

See: b71528d8Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bff0349d':
  avio: Add avio_read wrapper to simplify error checking
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cffb9ea8':
  mov: reject zero bytes_per_frame with non-zero samples_per_frame

See: 83a04f8cMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8e9c39e8':
  mov: abort on EOF in ff_mov_read_chan

See: a5718863Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a8a90906':
  mov: Correctly allocate ctts_data

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

* commit 'f261a55d':
  mov: Fix two memleaks

See: 8e77f8abMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3f38d4b8':
  vp9: Parse subsampling and report missing feature

Conflicts:
	libavcodec/vp9.c
	libavcodec/vp9.h

No change as FFmpeg already supports subsampling
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd68c0538':
  x86: check for AV_CPU_FLAG_AVXSLOW where useful

See: c16e99e3Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'cae39851':
  x86: Add helper macros to check for slow cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f7cafb5d':
  x86: add AV_CPU_FLAG_AVXSLOW flag

Conflicts:
	doc/APIchanges
	libavutil/version.h

See: c312bfacMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd0bf20a4':
  ppc: vsx: Implement diff_pixels and get_pixels
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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