mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'
* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90': Move all example programs to doc/examples Conflicts: configure doc/Makefile doc/doxy-wrapper.sh doc/examples/avcodec.c doc/examples/decoding_encoding.c doc/examples/metadata.c doc/examples/muxing.c doc/examples/transcode_aac.c libavcodec/Makefile libavcodec/api-example.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
1fc74926a5
|
@ -35,7 +35,7 @@
|
||||||
/doc/avoptions_codec.texi
|
/doc/avoptions_codec.texi
|
||||||
/doc/avoptions_format.texi
|
/doc/avoptions_format.texi
|
||||||
/doc/examples/avio_reading
|
/doc/examples/avio_reading
|
||||||
/doc/examples/decoding_encoding
|
/doc/examples/avcodec
|
||||||
/doc/examples/demuxing_decoding
|
/doc/examples/demuxing_decoding
|
||||||
/doc/examples/filtering_audio
|
/doc/examples/filtering_audio
|
||||||
/doc/examples/filtering_video
|
/doc/examples/filtering_video
|
||||||
|
|
|
@ -96,7 +96,6 @@ TESTPROGS += $(TESTPROGS-yes)
|
||||||
LDLIBS = $(FFLIBS:%=%$(BUILDSUF))
|
LDLIBS = $(FFLIBS:%=%$(BUILDSUF))
|
||||||
FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS)
|
FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS)
|
||||||
|
|
||||||
EXAMPLES := $(EXAMPLES:%=$(SUBDIR)%-example$(EXESUF))
|
|
||||||
OBJS := $(sort $(OBJS:%=$(SUBDIR)%))
|
OBJS := $(sort $(OBJS:%=$(SUBDIR)%))
|
||||||
SLIBOBJS := $(sort $(SLIBOBJS:%=$(SUBDIR)%))
|
SLIBOBJS := $(sort $(SLIBOBJS:%=$(SUBDIR)%))
|
||||||
TESTOBJS := $(TESTOBJS:%=$(SUBDIR)%) $(TESTPROGS:%=$(SUBDIR)%-test.o)
|
TESTOBJS := $(TESTOBJS:%=$(SUBDIR)%) $(TESTPROGS:%=$(SUBDIR)%-test.o)
|
||||||
|
|
|
@ -1245,7 +1245,7 @@ COMPONENT_LIST="
|
||||||
|
|
||||||
EXAMPLE_LIST="
|
EXAMPLE_LIST="
|
||||||
avio_reading_example
|
avio_reading_example
|
||||||
decoding_encoding_example
|
avcodec_example
|
||||||
demuxing_decoding_example
|
demuxing_decoding_example
|
||||||
filtering_audio_example
|
filtering_audio_example
|
||||||
filtering_video_example
|
filtering_video_example
|
||||||
|
@ -2403,7 +2403,7 @@ zmq_filter_deps="libzmq"
|
||||||
|
|
||||||
# examples
|
# examples
|
||||||
avio_reading="avformat avcodec avutil"
|
avio_reading="avformat avcodec avutil"
|
||||||
decoding_encoding_example_deps="avcodec avutil"
|
avcodec_example_deps="avcodec avutil"
|
||||||
demuxing_decoding_example_deps="avcodec avformat avutil"
|
demuxing_decoding_example_deps="avcodec avformat avutil"
|
||||||
filtering_audio_example_deps="avfilter avcodec avformat avutil"
|
filtering_audio_example_deps="avfilter avcodec avformat avutil"
|
||||||
filtering_video_example_deps="avfilter avcodec avformat avutil"
|
filtering_video_example_deps="avfilter avcodec avformat avutil"
|
||||||
|
|
|
@ -37,7 +37,7 @@ DOCS-$(CONFIG_TXTPAGES) += $(TXTPAGES)
|
||||||
DOCS = $(DOCS-yes)
|
DOCS = $(DOCS-yes)
|
||||||
|
|
||||||
DOC_EXAMPLES-$(CONFIG_AVIO_READING_EXAMPLE) += avio_reading
|
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_DEMUXING_DECODING_EXAMPLE) += demuxing_decoding
|
||||||
DOC_EXAMPLES-$(CONFIG_FILTERING_AUDIO_EXAMPLE) += filtering_audio
|
DOC_EXAMPLES-$(CONFIG_FILTERING_AUDIO_EXAMPLE) += filtering_audio
|
||||||
DOC_EXAMPLES-$(CONFIG_FILTERING_VIDEO_EXAMPLE) += filtering_video
|
DOC_EXAMPLES-$(CONFIG_FILTERING_VIDEO_EXAMPLE) += filtering_video
|
||||||
|
|
|
@ -8,5 +8,5 @@ shift 2
|
||||||
doxygen - <<EOF
|
doxygen - <<EOF
|
||||||
@INCLUDE = ${DOXYFILE}
|
@INCLUDE = ${DOXYFILE}
|
||||||
INPUT = $@
|
INPUT = $@
|
||||||
EXAMPLE_PATH = ${SRC_PATH}/
|
EXAMPLE_PATH = ${SRC_PATH}/doc/examples
|
||||||
EOF
|
EOF
|
||||||
|
|
|
@ -12,7 +12,7 @@ CFLAGS := $(shell pkg-config --cflags $(FFMPEG_LIBS)) $(CFLAGS)
|
||||||
LDLIBS := $(shell pkg-config --libs $(FFMPEG_LIBS)) $(LDLIBS)
|
LDLIBS := $(shell pkg-config --libs $(FFMPEG_LIBS)) $(LDLIBS)
|
||||||
|
|
||||||
EXAMPLES= avio_reading \
|
EXAMPLES= avio_reading \
|
||||||
decoding_encoding \
|
avcodec \
|
||||||
demuxing_decoding \
|
demuxing_decoding \
|
||||||
filtering_video \
|
filtering_video \
|
||||||
filtering_audio \
|
filtering_audio \
|
||||||
|
@ -26,7 +26,7 @@ EXAMPLES= avio_reading \
|
||||||
OBJS=$(addsuffix .o,$(EXAMPLES))
|
OBJS=$(addsuffix .o,$(EXAMPLES))
|
||||||
|
|
||||||
# the following examples make explicit use of the math library
|
# the following examples make explicit use of the math library
|
||||||
decoding_encoding: LDLIBS += -lm
|
avcodec: LDLIBS += -lm
|
||||||
muxing: LDLIBS += -lm
|
muxing: LDLIBS += -lm
|
||||||
resampling_audio: LDLIBS += -lm
|
resampling_audio: LDLIBS += -lm
|
||||||
|
|
||||||
|
|
|
@ -24,10 +24,10 @@
|
||||||
* @file
|
* @file
|
||||||
* libavcodec API use example.
|
* libavcodec API use example.
|
||||||
*
|
*
|
||||||
|
* @example avcodec.c
|
||||||
* Note that libavcodec only handles codecs (mpeg, mpeg4, etc...),
|
* 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
|
* not file formats (avi, vob, mp4, mov, mkv, mxf, flv, mpegts, mpegps, etc...). See library 'libavformat' for the
|
||||||
* format handling
|
* format handling
|
||||||
* @example doc/examples/decoding_encoding.c
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
|
@ -20,7 +20,7 @@
|
||||||
* @file
|
* @file
|
||||||
* simple audio converter
|
* 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.
|
* Convert an input audio file to AAC in an MP4 container using FFmpeg.
|
||||||
* @author Andreas Unterweger (dustsigns@gmail.com)
|
* @author Andreas Unterweger (dustsigns@gmail.com)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -475,6 +475,7 @@ SLIBOBJS-$(HAVE_GNU_WINDRES) += avformatres.o
|
||||||
|
|
||||||
SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h
|
SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h
|
||||||
SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h
|
SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h
|
||||||
|
|
||||||
TESTPROGS = seek \
|
TESTPROGS = seek \
|
||||||
srtp \
|
srtp \
|
||||||
url \
|
url \
|
||||||
|
|
14
library.mak
14
library.mak
|
@ -5,7 +5,6 @@ LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
|
||||||
LIBMINOR := $(lib$(NAME)_VERSION_MINOR)
|
LIBMINOR := $(lib$(NAME)_VERSION_MINOR)
|
||||||
INCINSTDIR := $(INCDIR)/lib$(NAME)
|
INCINSTDIR := $(INCDIR)/lib$(NAME)
|
||||||
|
|
||||||
LIB_EXAMPLES := $(LIB_EXAMPLES) $(EXAMPLES)
|
|
||||||
INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%)
|
INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%)
|
||||||
|
|
||||||
all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME)
|
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
|
install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared
|
||||||
|
|
||||||
define RULES
|
define RULES
|
||||||
$(EXAMPLES) $(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB))
|
$(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB))
|
||||||
$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)
|
$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)
|
||||||
|
|
||||||
$(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
|
$(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
|
||||||
$$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS)
|
$$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS)
|
||||||
|
|
||||||
$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
|
$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
|
||||||
|
@ -62,7 +61,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
clean::
|
clean::
|
||||||
$(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
|
$(RM) $(addprefix $(SUBDIR),*-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
|
||||||
$(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%)
|
$(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%)
|
||||||
|
|
||||||
distclean:: clean
|
distclean:: clean
|
||||||
|
@ -106,8 +105,7 @@ endef
|
||||||
|
|
||||||
$(eval $(RULES))
|
$(eval $(RULES))
|
||||||
|
|
||||||
$(EXAMPLES) $(TOOLS): $(DEP_LIBS) $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
|
$(TOOLS): $(DEP_LIBS) $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
|
||||||
$(TESTPROGS): $(DEP_LIBS) $(SUBDIR)$(LIBNAME)
|
$(TESTPROGS): $(DEP_LIBS) $(SUBDIR)$(LIBNAME)
|
||||||
|
|
||||||
examples: $(EXAMPLES)
|
|
||||||
testprogs: $(TESTPROGS)
|
testprogs: $(TESTPROGS)
|
||||||
|
|
Loading…
Reference in New Issue