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 /configure | |
| parent | 9e329185d701f60412eb70c4ffbeb345bd459e82 (diff) | |
| parent | e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a (diff) | |
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 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1248,6 +1248,7 @@ EXAMPLE_LIST=" avio_reading_example avcodec_example demuxing_decoding_example + filter_audio_example filtering_audio_example filtering_video_example metadata_example @@ -2409,6 +2410,7 @@ zmq_filter_deps="libzmq" avio_reading="avformat avcodec avutil" avcodec_example_deps="avcodec avutil" demuxing_decoding_example_deps="avcodec avformat avutil" +filter_audio_example_deps="avfilter avutil" filtering_audio_example_deps="avfilter avcodec avformat avutil" filtering_video_example_deps="avfilter avcodec avformat avutil" metadata_example_deps="avformat avutil" |