avconv: support forcing codec tags for input streams
frame: add a convenience function for copying AVFrame data
lavc: use AVFrame API properly in ff_reget_buffer()
Use av_frame_copy() to simplify code where appropriate.
Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'

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

Conflicts:
	doc/ffmpeg.texi

See: 6bca574a98ba604459f6ee92538b19d25bba0973
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '1155fd02ae7bac215acab316e847c6bb25f74fc3'

* commit '1155fd02ae7bac215acab316e847c6bb25f74fc3':
  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>
avutil/frame_copy_audio: also check that channels match

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '8feac29cc46270cc89d6016340e7bac780877131'

* commit '8feac29cc46270cc89d6016340e7bac780877131':
  lavc: use AVFrame API properly in ff_reget_buffer()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

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

Conflicts:
	libavfilter/vf_copy.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libx265: Update API usage

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>
libx265: Support 4:4:4

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

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libx265: Properly handled dynamic linking with MSVC

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libx265: Use proper error code

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
avformat/options_table: add named constants for avoid_negative_ts

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>