summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2013-11-04 12:35:17 +0100
committerClément Bœsch <clement@stupeflix.com>2013-11-04 12:53:06 +0100
commitfb10b43fc42b278c856eb98df524048500648ea4 (patch)
tree8883df16a330eb3009310e408d9e95c340e1c84c
parentd10b1a200dc3676f014f7e2c020800a15c7cab8a (diff)
downloadffmpeg-streaming-fb10b43fc42b278c856eb98df524048500648ea4.zip
ffmpeg-streaming-fb10b43fc42b278c856eb98df524048500648ea4.tar.gz
doc/examples: rename demuxing to demuxing_decoding.
That example shows how the decoding process works, not only the demuxing.
-rw-r--r--.gitignore2
-rw-r--r--doc/examples/Makefile2
-rw-r--r--doc/examples/demuxing_decoding.c (renamed from doc/examples/demuxing.c)4
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 1f13ec4..7d8adda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@
/doc/avoptions_codec.texi
/doc/avoptions_format.texi
/doc/examples/decoding_encoding
-/doc/examples/demuxing
+/doc/examples/demuxing_decoding
/doc/examples/filtering_audio
/doc/examples/filtering_video
/doc/examples/metadata
diff --git a/doc/examples/Makefile b/doc/examples/Makefile
index 3d698cc..cc5ee11 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= decoding_encoding \
- demuxing \
+ demuxing_decoding \
filtering_video \
filtering_audio \
metadata \
diff --git a/doc/examples/demuxing.c b/doc/examples/demuxing_decoding.c
index b13246e..325c7b8 100644
--- a/doc/examples/demuxing.c
+++ b/doc/examples/demuxing_decoding.c
@@ -22,11 +22,11 @@
/**
* @file
- * libavformat demuxing API use example.
+ * Demuxing and decoding example.
*
* Show how to use the libavformat and libavcodec API to demux and
* decode audio and video data.
- * @example doc/examples/demuxing.c
+ * @example doc/examples/demuxing_decoding.c
*/
#include <libavutil/imgutils.h>
OpenPOWER on IntegriCloud