aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRong Yan <rongyan236@gmail.com>2014-09-01 21:46:22 -0400
committerMichael Niedermayer <michaelni@gmx.at>2014-09-02 04:19:15 +0200
commit6abeaf2781ce4b7c84a93904003ab60b6d64cf27 (patch)
treed3f3c58fd3dfb3946b6b5903ee53bd989b748bca
parent7cf1f0f4af702a57f84ecfae31a604c5ebe3f81b (diff)
downloadffmpeg-6abeaf2781ce4b7c84a93904003ab60b6d64cf27.tar.gz
build sys: enable the decoding_encoding example under the ffmpeg/doc/examples
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure1
-rw-r--r--doc/Makefile1
2 files changed, 2 insertions, 0 deletions
diff --git a/configure b/configure
index b41a54f20a..8f0b915577 100755
--- a/configure
+++ b/configure
@@ -2592,6 +2592,7 @@ zoompan_filter_deps="swscale"
# examples
avio_reading="avformat avcodec avutil"
avcodec_example_deps="avcodec avutil"
+decoding_encoding_example_deps="avcodec avformat avutil"
demuxing_decoding_example_deps="avcodec avformat avutil"
extract_mvs_example_deps="avcodec avformat avutil"
filter_audio_example_deps="avfilter avutil"
diff --git a/doc/Makefile b/doc/Makefile
index 2fb9058e6a..6f2812df1c 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -38,6 +38,7 @@ DOCS = $(DOCS-yes)
DOC_EXAMPLES-$(CONFIG_AVIO_READING_EXAMPLE) += avio_reading
DOC_EXAMPLES-$(CONFIG_AVCODEC_EXAMPLE) += avcodec
+DOC_EXAMPLES-$(CONFIG_DECODING_ENCODING_EXAMPLE) += decoding_encoding
DOC_EXAMPLES-$(CONFIG_DEMUXING_DECODING_EXAMPLE) += demuxing_decoding
DOC_EXAMPLES-$(CONFIG_EXTRACT_MVS_EXAMPLE) += extract_mvs
DOC_EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE) += filter_audio