Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Feb 2014 18:24:16 +0000 (19:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Feb 2014 19:26:00 +0000 (20:26 +0100)
commit1f2bacc897224db0a0940f0c6d08caf6b15f1017
treecf078726e32d56dde5af54368ffae31ba7aa5a71
parent9e329185d701f60412eb70c4ffbeb345bd459e82
parente7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a
Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

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

Conflicts:
.gitignore
configure
doc/Makefile

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