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

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

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

* qatar/master:
  lavfi: add compand audio filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/af_compand.c
	libavfilter/allfilters.c
	libavfilter/version.h

The filter is added as new one so as to ease clean merging of its changes
in debug-able steps
See: 6b68e2a4Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes ticket #3425.

* qatar/master:
  parser: cosmetics: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e7dfaf16':
  libavfilter: example audio filtering program

Conflicts:
	.gitignore
	configure
	doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes #3383.

* commit 'a1c69965':
  parser: K&R formatting cosmetics

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

* commit 'ed61f3ca':
  parser: Remove commented-out cruft
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Based on a patch by Andrew Kelley <superjoe30@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* qatar/master:
  texi2pod: always declare the pod file as UTF-8 encoded

Conflicts:
	doc/texi2pod.pl
Merged-by: Michael Niedermayer <michaelni@gmx.at>

new function allows to unref buffer and obtain its data.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avio_open2() only return < 0 when error.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  doc: fix one accented word
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '48d1ed9c':
  doc: name correct header

Conflicts:
	doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '39c2880e':
  af_volume: preserve frame properties

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

* commit 'dcc7e4bf':
  af_resample: preserve frame properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '67f2a688':
  avconv: remove a write-only variable

Conflicts:
	ffmpeg.c
	ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8aca00cc':
  libx265: Properly handled dynamic linking with MSVC

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

* commit '0f7fa48c':
  libx265: Support SAR

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

* commit '2142b2ef':
  libx265: Support 4:4:4

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

* commit 'd00a504b':
  libx265: Update API usage

Conflicts:
	libavcodec/libx265.c

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

Idea-by: ubitux
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>