[FFmpeg-cvslog] lavfi: change "transmedia" into "multimedia".

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Mon Jul 23 11:44:48 2012 +0200| [612307978d6e7969d864bc9eea3c095185531d31] | committer: Nicolas George

lavfi: change "transmedia" into "multimedia".

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

 doc/filters.texi            |    8 ++++----
 libavfilter/Makefile        |    2 +-
 libavfilter/allfilters.c    |    2 +-
 libavfilter/avf_showwaves.c |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 8ffe703..7efcf6f 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -4008,10 +4008,10 @@ tools.
 
 @c man end VIDEO SINKS
 
- at chapter Transmedia Filters
- at c man begin TRANSMEDIA FILTERS
+ at chapter Multimedia Filters
+ at c man begin MULTIMEDIA FILTERS
 
-Below is a description of the currently available transmedia filters.
+Below is a description of the currently available multimedia filters.
 
 @section concat
 
@@ -4126,4 +4126,4 @@ aevalsrc=sin(1*2*PI*t)*sin(880*2*PI*t):cos(2*PI*200*t),asplit[out0],showwaves=r=
 @end example
 @end itemize
 
- at c man end TRANSMEDIA FILTERS
+ at c man end MULTIMEDIA FILTERS
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index eae84fa..15ca959 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -198,7 +198,7 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yuvcsp.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yvu9.o
 OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
 
-# transmedia filters
+# multimedia filters
 OBJS-$(CONFIG_CONCAT_FILTER)                 += avf_concat.o
 OBJS-$(CONFIG_SHOWWAVES_FILTER)              += avf_showwaves.o
 
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index f35af65..58a3c14 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -135,7 +135,7 @@ void avfilter_register_all(void)
     REGISTER_FILTER (BUFFERSINK,  buffersink,  vsink);
     REGISTER_FILTER (NULLSINK,    nullsink,    vsink);
 
-    /* transmedia filters */
+    /* multimedia filters */
     REGISTER_FILTER (CONCAT,      concat,      avf);
     REGISTER_FILTER (SHOWWAVES,   showwaves,   avf);
 
diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c
index 2494a70..3939fe5 100644
--- a/libavfilter/avf_showwaves.c
+++ b/libavfilter/avf_showwaves.c
@@ -20,7 +20,7 @@
 
 /**
  * @file
- * audio to video transmedia filter
+ * audio to video multimedia filter
  */
 
 #include "libavutil/audioconvert.h"