parser: Remove commented-out cruft
parser: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
avcodec/vp8dsp: use AV_ZERO64 to clear idct coefficient rows

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter: example audio filtering program

Based on a patch by Andrew Kelley <superjoe30@gmail.com>

Signed-off-by: Diego Biurrun <diego@biurrun.de>
parser: cosmetics: Drop some unnecessary parentheses
mpegvideo: fix overwriting hwaccel surface objects

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mpegvideo: re-indent buffer clearing code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'ed61f3ca8a0664a697782253b354055136c5d303'

* commit 'ed61f3ca8a0664a697782253b354055136c5d303':
  parser: Remove commented-out cruft

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

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

Conflicts:
	libavcodec/parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/af_compand: fix invalid read

Fixes #3383.
Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

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

Conflicts:
	.gitignore
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  parser: cosmetics: Drop some unnecessary parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Read bits_per_coded_sample from V_MS/VFW/FOURCC mkv files.

Fixes ticket #3425.
lavfi: add compand audio filter

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Merge remote-tracking branch 'qatar/master'

* 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: 6b68e2a43b3407522080be50a2a19cff2f9715ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/af_compand: whitespace changes from af_compand_fork

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/af_compand_fork: avoid strtok_r() so as not to break build

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/af_compand: also support '|' as seperator

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/af_compand: merge uninit() calls on error from af_compand_fork.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/af_compand: merge avframe code from af_compand_fork

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