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

Conflicts:
	.gitignore
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-25 19:24:16 +01:00
commit 1f2bacc897
4 changed files with 368 additions and 0 deletions

1
.gitignore vendored
View file

@ -38,6 +38,7 @@
/doc/examples/avio_reading
/doc/examples/avcodec
/doc/examples/demuxing_decoding
/doc/examples/filter_audio
/doc/examples/filtering_audio
/doc/examples/filtering_video
/doc/examples/metadata