---
configure | 4 ++++
doc/Makefile | 4 +++-
libavcodec/api-example.c => doc/examples/avcodec.c | 2 +-
libavformat/metadata-example.c => doc/examples/metadata.c | 2 +-
libavcodec/Makefile | 2 --
libavformat/Makefile | 2 --
6 files changed, 9 insertions(+), 7 deletions(-)
rename libavcodec/api-example.c => doc/examples/avcodec.c (99%)
rename libavformat/metadata-example.c => doc/examples/metadata.c (97%)
diff --git a/configure b/configure
index a5407c7..292da47 100755
--- a/configure
+++ b/configure
@@ -1095,6 +1095,8 @@ COMPONENT_LIST="
"
EXAMPLE_LIST="
+ avcodec_example
+ metadata_example
output_example
transcode_aac_example
"
@@ -2020,6 +2022,8 @@ ocv_filter_deps="libopencv"
scale_filter_deps="swscale"
# examples
+avcodec_example_deps="avcodec avutil"
+metadata_example_deps="avformat avutil"
output_example_deps="avcodec avformat avutil swscale"
transcode_aac_example_deps="avcodec avformat avresample"
diff --git a/doc/Makefile b/doc/Makefile
index 6af8116..0cb2335 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -15,9 +15,11 @@ DOCS-$(CONFIG_POD2MAN) +=
$(MANPAGES) $(PODPAGES)
DOCS-$(CONFIG_TEXI2HTML) += $(HTMLPAGES)
DOCS = $(DOCS-yes)
+DOC_EXAMPLES-$(CONFIG_AVCODEC_EXAMPLE) += avcodec
+DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE) += metadata
DOC_EXAMPLES-$(CONFIG_OUTPUT_EXAMPLE) += output
DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE) += transcode_aac
-ALL_DOC_EXAMPLES = output transcode_aac
+ALL_DOC_EXAMPLES = avcodec metadata output transcode_aac
DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF))
ALL_DOC_EXAMPLES := $(ALL_DOC_EXAMPLES:%=doc/examples/%$(EXESUF))
diff --git a/libavcodec/api-example.c b/doc/examples/avcodec.c
similarity index 99%
rename from libavcodec/api-example.c
rename to doc/examples/avcodec.c
index 6abbddc..7c32f28 100644
--- a/libavcodec/api-example.c
+++ b/doc/examples/avcodec.c
@@ -22,7 +22,7 @@
* @file
* libavcodec API use example.
*
- * @example libavcodec/api-example.c
+ * @example doc/examples/avcodec.c
* Note that this library only handles codecs (mpeg, mpeg4, etc...),
* not file formats (avi, vob, etc...). See library 'libavformat' for the
* format handling
diff --git a/libavformat/metadata-example.c b/doc/examples/metadata.c
similarity index 97%
rename from libavformat/metadata-example.c
rename to doc/examples/metadata.c
index 7bf77e7..e69acde 100644
--- a/libavformat/metadata-example.c
+++ b/doc/examples/metadata.c
@@ -22,7 +22,7 @@
/**
* @file
- * @example libavformat/metadata-example.c
+ * @example doc/examples/metadata.c
* Shows how the metadata API can be used in application programs.
*/
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 58defc9..7b50c27 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -697,8 +697,6 @@ SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h
SKIPHEADERS-$(CONFIG_VDA) += vda.h
SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h
-EXAMPLES = api
-
TESTPROGS = dct \
fft \
fft-fixed \
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 4da3c3b..d491d43 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -392,8 +392,6 @@ OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o
SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h
SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h
-EXAMPLES = metadata \
-
TESTPROGS = seek \
srtp \
url \
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
