* commit '9e8bbe7d':
  license: Mention that vf_interlace is GPL, not LGPL

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

* commit '4d686fb7':
  matroskaenc: convert avstream stereo3d side data during encoding

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

* commit 'd4ae8ac9':
  matroskadec: parse stereo mode on decoding

Conflicts:
	Changelog
	libavformat/matroska.c
	libavformat/matroskadec.c

See: 4c509fe3 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '93014864':
  avcodec: add stream-level stereo3d side data

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/utils.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f2583bc8':
  matroska: list supported extensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Conflicts:
	libavdevice/x11grab.c

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

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

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

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

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

Write the StereoMode Embl to bitstream.

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

Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

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>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>

Also replace the plural form "multiplies" with "multiples".

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

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

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

* commit '8d27bf1c':
  x86: xvid: K&R formatting cosmetics

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

* commit 'dcb7c868':
  cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs

Conflicts:
	libavcodec/mpeg4videodec.c
	libavcodec/x86/Makefile
	libavcodec/x86/dct-test.c
	libavcodec/x86/xvididct_sse2.c
	libavcodec/xvididct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1f156af4':
  x86: xvid_idct: Drop unused definitions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '404731bd':
  pulse: Set the wallclock option as default

Conflicts:
	libavdevice/pulse_audio_dec.c

No change, the option was already default in FFmpeg since a long time
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ff771f79':
  vc1: Initialize start_code_found to 0
Merged-by: Michael Niedermayer <michaelni@gmx.at>

WebPMemoryWriterClear() must be used instead of free() when libwebp ABI version is > 0x0203
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

Ported from avresample
Code by:  Mans Rullgard, Janne Grunau, Martin Storsjo
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Timothy Gu <timothygu99@gmail.com>

This file with the incorrect name was added after the name was fixed in all other files.
This is thus fixing a mistake
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Instead skip the picture streams and flush the queued audio packets.
Should address ticket #3851.
Signed-off-by: James Almer <jamrial@gmail.com>