aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2014-04-01 11:12:51 +0200
committerStefano Sabatini <stefasab@gmail.com>2014-04-23 10:32:42 +0200
commitbf411fffd4535458bf3ad68ca3b9947458961abe (patch)
tree416e81319dc5f292ba09843445c3666587e31325
parentdc6a17cf74a90e41d70ea1753cdb70c0a5b2ced8 (diff)
downloadffmpeg-bf411fffd4535458bf3ad68ca3b9947458961abe.tar.gz
examples: rename avcodec.c to decoding_encoding.c
Restore the old name, which was more meaningful and consistent with the names of the other examples.
-rw-r--r--.gitignore2
-rwxr-xr-xconfigure2
-rw-r--r--doc/examples/Makefile2
-rw-r--r--doc/examples/decoding_encoding.c (renamed from doc/examples/avcodec.c)2
4 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index f2d09fd767..a7cd39bf67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@
/doc/avoptions_format.texi
/doc/doxy/html/
/doc/examples/avio_reading
-/doc/examples/avcodec
+/doc/examples/decoding_encoding
/doc/examples/demuxing_decoding
/doc/examples/filter_audio
/doc/examples/filtering_audio
diff --git a/configure b/configure
index 38d8a5d10a..fe0a5ff676 100755
--- a/configure
+++ b/configure
@@ -1284,7 +1284,7 @@ COMPONENT_LIST="
EXAMPLE_LIST="
avio_reading_example
- avcodec_example
+ decoding_encoding_example
demuxing_decoding_example
filter_audio_example
filtering_audio_example
diff --git a/doc/examples/Makefile b/doc/examples/Makefile
index 646a63d121..03c7021e8b 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= avio_reading \
- avcodec \
+ decoding_encoding \
demuxing_decoding \
filtering_video \
filtering_audio \
diff --git a/doc/examples/avcodec.c b/doc/examples/decoding_encoding.c
index 86727a7b48..0585e518ad 100644
--- a/doc/examples/avcodec.c
+++ b/doc/examples/decoding_encoding.c
@@ -24,7 +24,7 @@
* @file
* libavcodec API use example.
*
- * @example avcodec.c
+ * @example decoding_encoding.c
* Note that libavcodec only handles codecs (mpeg, mpeg4, etc...),
* not file formats (avi, vob, mp4, mov, mkv, mxf, flv, mpegts, mpegps, etc...). See library 'libavformat' for the
* format handling