Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 1f13ec4f01..7d8addade9 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 3d698cc08a..cc5ee1121f 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 b13246e2a4..325c7b8cda 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>