[FFmpeg-cvslog] doc/examples: rename demuxing to demuxing_decoding.

Clément Bœsch git at videolan.org
Mon Nov 4 12:54:09 CET 2013


ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Mon Nov  4 12:35:17 2013 +0100| [fb10b43fc42b278c856eb98df524048500648ea4] | committer: Clément Bœsch

doc/examples: rename demuxing to demuxing_decoding.

That example shows how the decoding process works, not only the
demuxing.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb10b43fc42b278c856eb98df524048500648ea4
---

 .gitignore                                       |    2 +-
 doc/examples/Makefile                            |    2 +-
 doc/examples/{demuxing.c => demuxing_decoding.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
similarity index 99%
rename from doc/examples/demuxing.c
rename to 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>



More information about the ffmpeg-cvslog mailing list