* qatar/master:
  x86: Change a missed occurrance of int to ptrdiff_t for strides
  x86: Remove win64 xmm clobbering wrappers for the now removed avcodec_encode_video function
  bktr: Add missing includes for av_gettime()
  fate: use little endian yuv444p10 in h264-reinit tests

Nothing changes through this merge as the 3 bugfixes already exist
in ffmpeg and the clobbering wraper is still in use as we did not
yet remove avcodec_encode_video
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Martin Storsjö <martin@martin.st>

* cus/stable:
  ffplay: avoid frame data leak on early frame drop
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes fate-lavf-flm under valgrind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

The partial frames leak a few uninitialized pixels through
due to incomplete interlaced error concealment support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Martin Storsjö <martin@martin.st>

This is necessary after the old av_gettime in libavformat was
dropped.
Signed-off-by: Martin Storsjö <martin@martin.st>

Fixes fate big endian configs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Samplerate and channel layouts must be set in query_formats.

Signed-off-by: Bojan Zivkovic <bojan@mips.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes "quality 10" mode from Ticket1873
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

An input channel could have been previously set with another application, like
v4l2-ctl, so if no input channel is specified use the previosly selected one.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes fate big endian configs.

When multiple frame are encoded during vsync, current code only
do_video_stats once. This need to do it every frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  fate: add test for cropping h264 to container dimensions
  FATE: add a tscc2 test.
  tscc2: allocate AVFrame properly.

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

* commit '20a8ee30':
  af_asyncts: fix compensation and PTS monotonicity
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1e8b9738':
  avutil/frame: add all remaining frame properties to av_frame_copy_props
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Marton Balint <cus@passwd.hu>