summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--common.mak1
-rwxr-xr-xconfigure4
-rw-r--r--doc/Makefile2
-rwxr-xr-xdoc/doxy-wrapper.sh2
-rw-r--r--doc/examples/Makefile4
-rw-r--r--doc/examples/avcodec.c (renamed from doc/examples/decoding_encoding.c)2
-rw-r--r--doc/examples/transcode_aac.c2
-rw-r--r--libavformat/Makefile1
-rw-r--r--library.mak14
10 files changed, 16 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore
index d03a6b9..96ec9a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,7 @@
/doc/avoptions_codec.texi
/doc/avoptions_format.texi
/doc/examples/avio_reading
-/doc/examples/decoding_encoding
+/doc/examples/avcodec
/doc/examples/demuxing_decoding
/doc/examples/filtering_audio
/doc/examples/filtering_video
diff --git a/common.mak b/common.mak
index 50469a1..b557dff 100644
--- a/common.mak
+++ b/common.mak
@@ -96,7 +96,6 @@ TESTPROGS += $(TESTPROGS-yes)
LDLIBS = $(FFLIBS:%=%$(BUILDSUF))
FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS)
-EXAMPLES := $(EXAMPLES:%=$(SUBDIR)%-example$(EXESUF))
OBJS := $(sort $(OBJS:%=$(SUBDIR)%))
SLIBOBJS := $(sort $(SLIBOBJS:%=$(SUBDIR)%))
TESTOBJS := $(TESTOBJS:%=$(SUBDIR)%) $(TESTPROGS:%=$(SUBDIR)%-test.o)
diff --git a/configure b/configure
index b1e9e29..0ad174c 100755
--- a/configure
+++ b/configure
@@ -1245,7 +1245,7 @@ COMPONENT_LIST="
EXAMPLE_LIST="
avio_reading_example
- decoding_encoding_example
+ avcodec_example
demuxing_decoding_example
filtering_audio_example
filtering_video_example
@@ -2403,7 +2403,7 @@ zmq_filter_deps="libzmq"
# examples
avio_reading="avformat avcodec avutil"
-decoding_encoding_example_deps="avcodec avutil"
+avcodec_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"
diff --git a/doc/Makefile b/doc/Makefile
index 3334ca2..3dbdb15 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -37,7 +37,7 @@ DOCS-$(CONFIG_TXTPAGES) += $(TXTPAGES)
DOCS = $(DOCS-yes)
DOC_EXAMPLES-$(CONFIG_AVIO_READING_EXAMPLE) += avio_reading
-DOC_EXAMPLES-$(CONFIG_DECODING_ENCODING_EXAMPLE) += decoding_encoding
+DOC_EXAMPLES-$(CONFIG_AVCODEC_EXAMPLE) += avcodec
DOC_EXAMPLES-$(CONFIG_DEMUXING_DECODING_EXAMPLE) += demuxing_decoding
DOC_EXAMPLES-$(CONFIG_FILTERING_AUDIO_EXAMPLE) += filtering_audio
DOC_EXAMPLES-$(CONFIG_FILTERING_VIDEO_EXAMPLE) += filtering_video
diff --git a/doc/doxy-wrapper.sh b/doc/doxy-wrapper.sh
index da464bc..13be8cb 100755
--- a/doc/doxy-wrapper.sh
+++ b/doc/doxy-wrapper.sh
@@ -8,5 +8,5 @@ shift 2
doxygen - <<EOF
@INCLUDE = ${DOXYFILE}
INPUT = $@
-EXAMPLE_PATH = ${SRC_PATH}/
+EXAMPLE_PATH = ${SRC_PATH}/doc/examples
EOF
diff --git a/doc/examples/Makefile b/doc/examples/Makefile
index f4f6c70..1553bab 100644
--- a/doc/examples/Makefile
+++ b/doc/examples/Makefile
@@ -12,7 +12,7 @@ CFLAGS := $(shell pkg-config --cflags $(FFMPEG_LIBS)) $(CFLAGS)
LDLIBS := $(shell pkg-config --libs $(FFMPEG_LIBS)) $(LDLIBS)
EXAMPLES= avio_reading \
- decoding_encoding \
+ avcodec \
demuxing_decoding \
filtering_video \
filtering_audio \
@@ -26,7 +26,7 @@ EXAMPLES= avio_reading \
OBJS=$(addsuffix .o,$(EXAMPLES))
# the following examples make explicit use of the math library
-decoding_encoding: LDLIBS += -lm
+avcodec: LDLIBS += -lm
muxing: LDLIBS += -lm
resampling_audio: LDLIBS += -lm
diff --git a/doc/examples/decoding_encoding.c b/doc/examples/avcodec.c
index c3b501c..d56e6a4 100644
--- a/doc/examples/decoding_encoding.c
+++ b/doc/examples/avcodec.c
@@ -24,10 +24,10 @@
* @file
* libavcodec API use example.
*
+ * @example avcodec.c
* Note that libavcodec only handles codecs (mpeg, mpeg4, etc...),
* not file formats (avi, vob, mp4, mov, mkv, mxf, flv, mpegts, mpegps, etc...). See library 'libavformat' for the
* format handling
- * @example doc/examples/decoding_encoding.c
*/
#include <math.h>
diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c
index 2d4e55a..bf0128f 100644
--- a/doc/examples/transcode_aac.c
+++ b/doc/examples/transcode_aac.c
@@ -20,7 +20,7 @@
* @file
* simple audio converter
*
- * @example doc/examples/transcode_aac.c
+ * @example transcode_aac.c
* Convert an input audio file to AAC in an MP4 container using FFmpeg.
* @author Andreas Unterweger (dustsigns@gmail.com)
*/
diff --git a/libavformat/Makefile b/libavformat/Makefile
index ff98b9b..3c72288 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -475,6 +475,7 @@ SLIBOBJS-$(HAVE_GNU_WINDRES) += avformatres.o
SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h
SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h
+
TESTPROGS = seek \
srtp \
url \
diff --git a/library.mak b/library.mak
index 8bafb04..cd39f11 100644
--- a/library.mak
+++ b/library.mak
@@ -5,7 +5,6 @@ LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
LIBMINOR := $(lib$(NAME)_VERSION_MINOR)
INCINSTDIR := $(INCDIR)/lib$(NAME)
-LIB_EXAMPLES := $(LIB_EXAMPLES) $(EXAMPLES)
INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%)
all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME)
@@ -43,10 +42,10 @@ install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static
install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared
define RULES
-$(EXAMPLES) $(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB))
-$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)
+$(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB))
+$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)
-$(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
+$(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
$$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS)
$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
@@ -62,7 +61,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
endif
clean::
- $(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+ $(RM) $(addprefix $(SUBDIR),*-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
$(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%)
distclean:: clean
@@ -106,8 +105,7 @@ endef
$(eval $(RULES))
-$(EXAMPLES) $(TOOLS): $(DEP_LIBS) $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
-$(TESTPROGS): $(DEP_LIBS) $(SUBDIR)$(LIBNAME)
+$(TOOLS): $(DEP_LIBS) $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
+$(TESTPROGS): $(DEP_LIBS) $(SUBDIR)$(LIBNAME)
-examples: $(EXAMPLES)
testprogs: $(TESTPROGS)
OpenPOWER on IntegriCloud