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

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

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

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

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

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

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

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: NJames Zern <jzern@google.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

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

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

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

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

Conflicts:
	libavcodec/x86/xvididct_sse2.c
Merged-by: NMichael 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: NMichael Niedermayer <michaelni@gmx.at>

* commit '1f156af4':
  x86: xvid_idct: Drop unused definitions
Merged-by: NMichael 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: NMichael Niedermayer <michaelni@gmx.at>

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

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

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

Signed-off-by: NTimothy 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: NMichael Niedermayer <michaelni@gmx.at>

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

Added support for AC3 heavy dynamic range compression used
to restrict the output range and added a setting to specify
the output target level and use the dialog normalization
field to apply it in the digital domain.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

* commit 'f5245a9c':
  avconv: fix parsing the AVOptions for -target
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '1688eef2':
  avconv: fix the muxrate values for -target

Conflicts:
	ffmpeg_opt.c

No change, as ffmpegs muxrate is in bits/sec
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Leftover of a4d3c200.

* commit '75bbaf24':
  mpegenc: limit the maximum muxrate

Conflicts:
	libavformat/mpegenc.c

See: 28d35dbeMerged-by: NMichael Niedermayer <michaelni@gmx.at>

CC: libav-stable@libav.org

The mpegenc private option values are in 50-byte units.

CC: libav-stable@libav.org

It is written to the file as a 22-bit value.

CC: libav-stable@libav.org

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

* commit 'e87f5e4e':
  h264: fully check cropping amount from sps

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

* commit '0a024268':
  libxvid: K&R formatting cosmetics

Conflicts:
	libavcodec/libxvid.c
	libavcodec/libxvid_rc.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>