Michael Niedermayer 1f2bacc897 Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'
* commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a':
  libavfilter: example audio filtering program

Conflicts:
	.gitignore
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-25 20:26:00 +01:00
..
2014-02-16 22:08:21 +01:00
2014-02-09 17:15:19 +01:00
2013-08-29 22:52:04 +02:00
2013-02-14 23:45:48 +01:00