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

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

* commit '27631796':
  ac3: Only initialize float_dsp for the float encoder variant
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f0ce9913':
  Rename tpel_template.c ---> pel_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Note linesize is rounded up to at least a multiple of 8
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Tim.Nicholson <tim.nicholson@bbc.co.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This can help "extreme" resizes, e.g with some 4k stuff.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

The new name more accurately describes what the file is about.

This fixes a race condition and use of the wrong field, which become shared
instead of per thread during some AVFrame changes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '4321e507':
  configure: use pkg-config for libx264

Not merged as requested by carl
a patch to fix this has been posted by carl to ffmpeg-devel
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes fate-vsynth3-wmv2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ceada893':
  libx265: Remove unneeded bit depth check

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

* commit '61a34491':
  libx265: Add 4:2:2 support

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

* commit '180e6b48':
  libx265: Actually use X265_API_IMPORTS

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

* commit 'dca7ba4b':
  Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs

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

This is no longer needed since the version bump.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

It is also not final yet, so require -strict experimental.

Requires a bump to version 17.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

It obvously needs to be above the include statement.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This is no longer needed since the version bump.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

The files are only ever compiled if that condition is true.

It is also not final yet, so require -strict experimental.

Requires a bump to version 17.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

It obvously needs to be above the include statement.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '48e50921':
  avconv: make -shortest work with streamcopy

Conflicts:
	ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Resolution can be 1920x1080 or 960x540.

CC: libav-stable@libav.org

Fixes track ticket 3717.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2f417031':
  libx264: Support bitrate reconfiguration
Merged-by: Michael Niedermayer <michaelni@gmx.at>

They used an extra, undeclared register. Fixes a crash in
fate-vsynth3-ffvhuff444p16
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cd62c04d':
  h263enc: keep block_last_index always valid during advanced intra coding
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

* commit '0ddc53da':
  mpegvideo: synchronize AVFrame pointers in ERContext fully

Conflicts:
	libavcodec/mpegvideo.c

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

Sometimes the input buffers get directly used as raw images and
SIMD optimized video/image filters can sometimes read more than 16 bytes
over the end.
a specific example is the AVX 24bpp to yuv code

This also fixes fate-vsynth3-rgb
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes valgrind mpeg4 failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Lou Logan <lou@lrcd.com>