diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2013-11-28 13:55:34 +0100 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2013-11-28 13:55:34 +0100 |
| commit | 1a88e84fd54fd7a9ae334e989a9805f11f327864 (patch) | |
| tree | 5536a270cb6ff50b490b1a3878e32d0d8545626b | |
| parent | a8ac2a15303021d39960ff822f58c90e69a5c6fb (diff) | |
| download | ffmpeg-1a88e84fd54fd7a9ae334e989a9805f11f327864.tar.gz | |
build: integrate remaining examples.
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | doc/Makefile | 9 |
2 files changed, 22 insertions, 1 deletions
@@ -1165,7 +1165,14 @@ COMPONENT_LIST=" " EXAMPLE_LIST=" + decoding_encoding_example + demuxing_decoding_example + filtering_audio_example + filtering_video_example + metadata_example muxing_example + resampling_audio_example + scaling_video_example transcode_aac_example " @@ -2276,7 +2283,14 @@ tinterlace_pad_test_deps="tinterlace_filter" zmq_filter_deps="libzmq" # examples +decoding_encoding_example_deps="avcodec avutil" +demuxing_decoding_example_deps="avcodec avformat avutil" +filtering_audio_example_deps="avfilter avcodec avformat avutil" +filtering_video_example_deps="avfilter avcodec avformat avutil" +metadata_example_deps="avformat avutil" muxing_example_deps="avcodec avformat avutil swscale" +resampling_audio_example_deps="avutil swresample" +scaling_video_example_deps="avutil swscale" transcode_aac_example_deps="avcodec avformat swresample" # libraries diff --git a/doc/Makefile b/doc/Makefile index 519da073a4..9bd4d4e17a 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -36,9 +36,16 @@ DOCS-$(CONFIG_MANPAGES) += $(MANPAGES) DOCS-$(CONFIG_TXTPAGES) += $(TXTPAGES) DOCS = $(DOCS-yes) +DOC_EXAMPLES-$(CONFIG_DECODING_ENCODING_EXAMPLE) += decoding_encoding +DOC_EXAMPLES-$(CONFIG_DEMUXING_DECODING_EXAMPLE) += demuxing_decoding +DOC_EXAMPLES-$(CONFIG_FILTERING_AUDIO_EXAMPLE) += filtering_audio +DOC_EXAMPLES-$(CONFIG_FILTERING_VIDEO_EXAMPLE) += filtering_video +DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE) += metadata DOC_EXAMPLES-$(CONFIG_MUXING_EXAMPLE) += muxing +DOC_EXAMPLES-$(CONFIG_RESAMPLING_AUDIO_EXAMPLE) += resampling_audio +DOC_EXAMPLES-$(CONFIG_SCALING_VIDEO_EXAMPLE) += scaling_video DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE) += transcode_aac -ALL_DOC_EXAMPLES = muxing transcode_aac +ALL_DOC_EXAMPLES = $(DOC_EXAMPLES-) $(DOC_EXAMPLES-yes) DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)$(EXESUF)) ALL_DOC_EXAMPLES := $(ALL_DOC_EXAMPLES:%=doc/examples/%$(PROGSSUF)$(EXESUF)) |