* qatar/master:
  mpegvideo_enc: Don't call ff_h263dsp_init unconditionally

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

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

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

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

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

This fixes builds with e.g. --disable-decoders --disable-encoders
--enable-encoder=mjpeg.
Signed-off-by: Martin Storsjö <martin@martin.st>

* qatar/master:
  bfin: vp3: Mark all binary object sections appropriately
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ea49f605':
  h264: skip chroma edges at the picture boundary while deblocking 4:4:4

Conflicts:
	libavcodec/h264.c

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

* commit '8267f936':
  configure: Set default HOSTCFLAGS/HOSTCPPFLAGS after compiler detection
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixed/improved multistrip adaptivity.
Improved R/D by optimized codebook generation.
Support for the correct color space.
Vintage compatibility.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

With permission of Tomas Härdin applied by Rl aetey.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes a leftover from e44d7c65.

This handles macroblock edges for the chroma components in the same way
as for the luma compoment for 4:4:4 streams. The Spec explicitly states
that the deblocking filter is not applied to edges at the boundary of
the picture.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>

This prevents the default HOSTCFLAGS from getting clobbered by flags
passed to configure on the command line.

* 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.