diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-25 19:24:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-25 20:26:00 +0100 |
| commit | 1f2bacc897224db0a0940f0c6d08caf6b15f1017 (patch) | |
| tree | cf078726e32d56dde5af54368ffae31ba7aa5a71 /.gitignore | |
| parent | 9e329185d701f60412eb70c4ffbeb345bd459e82 (diff) | |
| parent | e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a (diff) | |
| download | ffmpeg-streaming-1f2bacc897224db0a0940f0c6d08caf6b15f1017.zip ffmpeg-streaming-1f2bacc897224db0a0940f0c6d08caf6b15f1017.tar.gz | |
Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'
* commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a':
libavfilter: example audio filtering program
Conflicts:
.gitignore
configure
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 |
