diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 01:48:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 02:22:01 +0100 |
| commit | 1fc74926a5d13261721e1c9962c48db00d214853 (patch) | |
| tree | 8215350a6b41a26d8d9041e594e6b927ed8e5e40 /doc | |
| parent | 91253839e14cce9793ee93f184cef609ca8195d5 (diff) | |
| parent | b339182eba34f28de5f1a477cdd2c84f1ef35d90 (diff) | |
| download | ffmpeg-streaming-1fc74926a5d13261721e1c9962c48db00d214853.zip ffmpeg-streaming-1fc74926a5d13261721e1c9962c48db00d214853.tar.gz | |
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>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 2 | ||||
| -rwxr-xr-x | doc/doxy-wrapper.sh | 2 | ||||
| -rw-r--r-- | doc/examples/Makefile | 4 | ||||
| -rw-r--r-- | doc/examples/avcodec.c (renamed from doc/examples/decoding_encoding.c) | 2 | ||||
| -rw-r--r-- | doc/examples/transcode_aac.c | 2 |
5 files changed, 6 insertions, 6 deletions
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) */ |
