* lukaszmluki/master:
  lavf/ftp: remove double space
  lavf/libssh: fix seek with whence==SEEK_CUR
  lavf/libssh: rename context variable from s into libssh
  lavf/libssh: add av_cold attributes
  lavf/libssh: factorize create_sftp_session function
  lavf/libssh: factorize create_ssh_session function
  lavf/libssh: factorize file_stat function
  lavf/libssh: factorize open_file function
  lavf/libssh: add private_key option
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Allows to specify private key to use during authorization.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

This uses STTS and TRUN information to calculate the fps
It seems to work with more files than the previous code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  rgb2rgb_template: add MMX/SSE2/AVX-optimized deinterleaveBytes

Conflicts:
	libswscale/x86/rgb2rgb_template.c

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

* commit '7597e6ef':
  swscale/x86/rgb2rgb: add support for AVX

Conflicts:
	libswscale/x86/rgb2rgb_template.c

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

* commit '9047491f':
  swscale: add nv12/nv21->yuv420 converter

Conflicts:
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb_template.c

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

* commit 'eb01a25f':
  swscale: fix stride used in planarToNv12Wrapper()

Conflicts:
	libswscale/swscale_unscaled.c

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

* commit 'e0ab5078':
  lavc: do not force the emu edge flag

Conflicts:
	libavcodec/utils.c

There should be no such bugs in ffmpeg, but merging it anyway
as its safer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '025fd76e':
  dxtory: change error code for unexpected slice configuration
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e91a3f1b':
  dxtory: correctly handle YUV slices with average odd height
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ade4ecb4':
  dxva2: Use correct printf format strings
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '766df7ca':
  dxva2: Add missing #includes

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

In particular, avoid to leave around the seg->avf pointer to freed
structure, and fix crash with:
ffmpeg -f lavfi -i testsrc -c:v h264 -map 0 -f segment foo-%d.ts

The avcodec_get_frame_defaults() function is deprecated and its use
doesn't seem required.

The used heuristic will potentially need to be finetuned
Fixes daemon404s fps.mov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes these errors with nasm:
libavcodec/x86/lossless_videodsp.asm:86: error: invalid combination of opcode and operands
libavcodec/x86/lossless_videodsp.asm:88: error: invalid combination of opcode and operands
I don't know whether movd or movq was meant, but either way
maskq vs. maskd must match the mov size.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

This does not yet include any actual AVX code
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>

The default get_buffer2() implementation (and possibly some
user ones) does not allocate edges when this flag is set, which may
expose bugs in some decoders. Until the 10 release is out, it is safer
to remove this part.

* qatar/master:
  dxva2: Log errors verbosely
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5b2b23f2':
  dxva2: Retry IDirectXVideoDecoder_BeginFrame()

This also adds a missig #include to prevent breaking building
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e22ebd04':
  hevc: Bound check cu_qp_delta

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

* commit '0d999333':
  hevc: Bound check slice_qp

Conflicts:
	libavcodec/hevc.c

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

* commit '838740e6':
  hevc: Prevent some integer overflows
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'faf03ecb':
  hevc: Remove useless clip

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

* commit 'a246d06f':
  hevc: clip pixels when transquant bypass is used

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