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 /doc/Makefile | |
| parent | 9e329185d701f60412eb70c4ffbeb345bd459e82 (diff) | |
| parent | e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a (diff) | |
| download | ffmpeg-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 'doc/Makefile')
| -rw-r--r-- | doc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/Makefile b/doc/Makefile index 3dbdb15e1b..44049c4d7c 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -39,6 +39,7 @@ DOCS = $(DOCS-yes) DOC_EXAMPLES-$(CONFIG_AVIO_READING_EXAMPLE) += avio_reading DOC_EXAMPLES-$(CONFIG_AVCODEC_EXAMPLE) += avcodec DOC_EXAMPLES-$(CONFIG_DEMUXING_DECODING_EXAMPLE) += demuxing_decoding +DOC_EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE) += filter_audio DOC_EXAMPLES-$(CONFIG_FILTERING_AUDIO_EXAMPLE) += filtering_audio DOC_EXAMPLES-$(CONFIG_FILTERING_VIDEO_EXAMPLE) += filtering_video DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE) += metadata |