[FFmpeg-devel] [PATCH 2/2] doc/examples: rename demuxing to decoding.

Clément Bœsch u at pkh.me
Wed Oct 30 16:28:52 CET 2013


From: Clément Bœsch <clement at stupeflix.com>

This example shows how to decode more than how to demux (demuxing just
happens to be necessary for decoding).
---
 .gitignore                              | 2 +-
 doc/examples/Makefile                   | 4 ++--
 doc/examples/{demuxing.c => decoding.c} | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename doc/examples/{demuxing.c => decoding.c} (99%)

diff --git a/.gitignore b/.gitignore
index 1f13ec4..1d16dd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,8 +35,8 @@
 /doc/config.texi
 /doc/avoptions_codec.texi
 /doc/avoptions_format.texi
+/doc/examples/decoding
 /doc/examples/decoding_encoding
-/doc/examples/demuxing
 /doc/examples/filtering_audio
 /doc/examples/filtering_video
 /doc/examples/metadata
diff --git a/doc/examples/Makefile b/doc/examples/Makefile
index 3d698cc..be07da2 100644
--- a/doc/examples/Makefile
+++ b/doc/examples/Makefile
@@ -11,8 +11,8 @@ CFLAGS += -Wall -g
 CFLAGS := $(shell pkg-config --cflags $(FFMPEG_LIBS)) $(CFLAGS)
 LDLIBS := $(shell pkg-config --libs $(FFMPEG_LIBS)) $(LDLIBS)
 
-EXAMPLES=       decoding_encoding                  \
-                demuxing                           \
+EXAMPLES=       decoding                           \
+                decoding_encoding                  \
                 filtering_video                    \
                 filtering_audio                    \
                 metadata                           \
diff --git a/doc/examples/demuxing.c b/doc/examples/decoding.c
similarity index 99%
rename from doc/examples/demuxing.c
rename to doc/examples/decoding.c
index 379b1ea..d391a0c 100644
--- a/doc/examples/demuxing.c
+++ b/doc/examples/decoding.c
@@ -26,7 +26,7 @@
  *
  * 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/decoding.c
  */
 
 #include <libavutil/imgutils.h>
-- 
1.8.4.1



More information about the ffmpeg-devel mailing list