[FFmpeg-cvslog] Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 25 19:24:16 2014 +0100| [1f2bacc897224db0a0940f0c6d08caf6b15f1017] | committer: Michael Niedermayer

Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

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

Conflicts:
	.gitignore
	configure
	doc/Makefile

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f2bacc897224db0a0940f0c6d08caf6b15f1017
---