diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 10:30:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-27 10:31:08 +0100 |
| commit | 715f3623f8cd16c9e8d704bad45b76aa30d31cd2 (patch) | |
| tree | d69db24220cb75d3e77561453e0c21cf8ff783a2 /doc/Makefile | |
| parent | 3aaa50a9972c9f350ad9ce6decf3ecb2aaffa84a (diff) | |
| parent | 10421bcf0ab5d48fa3d84de803e657b77fe7d3c0 (diff) | |
| download | ffmpeg-715f3623f8cd16c9e8d704bad45b76aa30d31cd2.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add an audio transcoding example.
Conflicts:
configure
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/Makefile')
| -rw-r--r-- | doc/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/Makefile b/doc/Makefile index 701a51074b..519da073a4 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -37,7 +37,8 @@ DOCS-$(CONFIG_TXTPAGES) += $(TXTPAGES) DOCS = $(DOCS-yes) DOC_EXAMPLES-$(CONFIG_MUXING_EXAMPLE) += muxing -ALL_DOC_EXAMPLES = muxing +DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE) += transcode_aac +ALL_DOC_EXAMPLES = muxing transcode_aac DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)$(EXESUF)) ALL_DOC_EXAMPLES := $(ALL_DOC_EXAMPLES:%=doc/examples/%$(PROGSSUF)$(EXESUF)) |