doc/ffprobe: fix -show_entries example
avformat/icoenc: Remove deprecated use of codec_name

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
x11grab: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
x11grab: Small near-cosmetic refactorings

Signed-off-by: Diego Biurrun <diego@biurrun.de>
avcodec/libvpxenc: Adds support for constant quality mode in VP9.

Changes in the parameter mapping for libvpx to support the constant
quality mode in VP9. The assumption in the patch is that if crf is
provided but bitrate is 0, then the 'constant quality' mode of VP9
is used. However if both are present, the 'constrained quality' mode
is used as before.

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
x11grab: Drop a spurious space in the extension reporting message

Signed-off-by: Diego Biurrun <diego@biurrun.de>
x11grab: Use a typedef for the context, as most other code does

Signed-off-by: Diego Biurrun <diego@biurrun.de>
avcodec/flashsv2enc: fix "unused variable" warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/h264: Move h264_vdpau_class under ifdef to avoid unused variable warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/soxenc: return more meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
matroska: list supported extensions
avcodec: add stream-level stereo3d side data
matroskadec: parse stereo mode on decoding

Convert the Matroska stereo format to the Stereo3D format, and add a
Stereo3D side data to the stream.

Bump the doctype version supported.

Bug-Id: 728 / https://bugs.debian.org/757185
matroskaenc: convert avstream stereo3d side data during encoding

Write the StereoMode Embl to bitstream.
license: Mention that vf_interlace is GPL, not LGPL
Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'

* commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8':
  x11grab: K&R formatting cosmetics

Conflicts:
	libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'

* commit '20e82b41fcad23ebbb18d89948aebfcc53921198':
  x11grab: Small near-cosmetic refactorings

Conflicts:
	libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'

* commit '7bb505a33ca131906b2ceb2f298e104c862740ea':
  x11grab: Drop a spurious space in the extension reporting message

Conflicts:
	libavdevice/x11grab.c

See: 9af209712099699d717596f55b08b3bac8b6b563
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05'

* commit '58396e806c65fe0eb00e6ccf1980f810cdceed05':
  x11grab: Use a typedef for the context, as most other code does

Conflicts:
	libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef'

* commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef':
  matroska: list supported extensions

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