* commit 'dcc7e4bf':
  af_resample: preserve frame properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '67f2a688':
  avconv: remove a write-only variable

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

* commit '8aca00cc':
  libx265: Properly handled dynamic linking with MSVC

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

* commit '0f7fa48c':
  libx265: Support SAR

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

* commit '2142b2ef':
  libx265: Support 4:4:4

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

* commit 'd00a504b':
  libx265: Update API usage

Conflicts:
	libavcodec/libx265.c

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

Idea-by: ubitux
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* qatar/master:
  Use av_frame_copy() to simplify code where appropriate.

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

* commit '8feac29c':
  lavc: use AVFrame API properly in ff_reget_buffer()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '1155fd02':
  frame: add a convenience function for copying AVFrame data

Conflicts:
	doc/APIchanges
	libavutil/frame.c
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '746dca48':
  avconv: support forcing codec tags for input streams

Conflicts:
	doc/ffmpeg.texi

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

We need the emulation to support the cases where the first
argument is the same as the fourth. To achieve this a fifth
argument working as a temporary may be needed.
Emulation that doesn't obey the original instruction semantics
can't be in x86inc.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Idea-from/based-on: 7e86c27b
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes seeking with broken files
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  x86: add detection for Bit Manipulation Instruction sets

Conflicts:
	libavutil/x86/cpu.c

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

* commit '1b932eb1':
  x86: add detection for FMA3 instruction set

Conflicts:
	configure
	libavutil/cpu.h
	libavutil/x86/cpu.c

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

* commit '10b0161d':
  x86: add missing XOP checks and macros

Conflicts:
	configure
	libavutil/x86/cpu.h

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

* commit '5800ba0d':
  configure: disable cpunop if the check fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>

It is a processor feature, so it belongs there.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8eeacf31':
  hevc: Do not left shift a negative value in hevc_loop_filter_chroma
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ff486c0f':
  hevc: Do not right shift a negative value in get_pcm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '50c988aa':
  hevc: Drop unnecessary shifts in deblocking_filter_CTB
Merged-by: Michael Niedermayer <michaelni@gmx.at>

First pixel was computed based on invalid address read, and then
corrected by the following memcpy. After the commit, it's not computed
anymore, and memcpy fills the appropriate area.

Fixes Ticket #3387