aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-11 22:13:02 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-11 22:16:04 +0200
commitbe5ac961e0a087a5a420a0477f8861dd05d0b9b7 (patch)
tree805ab14b05ca09b4782c6b9d8b5b596d27c38bf8
parentf8e98061ecc7301c8e1f5b7b83344fa64b483e5c (diff)
downloadffmpeg-be5ac961e0a087a5a420a0477f8861dd05d0b9b7.tar.gz
examples/encoding: rename to decoding_encoding.c as the file is an example for both.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--doc/examples/Makefile2
-rw-r--r--doc/examples/decoding_encoding.c (renamed from doc/examples/encoding.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/doc/examples/Makefile b/doc/examples/Makefile
index fde2256fca..b363590d53 100644
--- a/doc/examples/Makefile
+++ b/doc/examples/Makefile
@@ -3,7 +3,7 @@ FFMPEG_LIBS=libavdevice libavformat libavfilter libavcodec libswscale libavutil
CFLAGS+=$(shell pkg-config --cflags $(FFMPEG_LIBS))
LDFLAGS+=$(shell pkg-config --libs $(FFMPEG_LIBS))
-EXAMPLES=encoding filtering metadata muxing
+EXAMPLES=decoding_encoding filtering metadata muxing
OBJS=$(addsuffix .o,$(EXAMPLES))
diff --git a/doc/examples/encoding.c b/doc/examples/decoding_encoding.c
index cd968dbf75..cd968dbf75 100644
--- a/doc/examples/encoding.c
+++ b/doc/examples/decoding_encoding.c