summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/filters.texi8
-rw-r--r--libavfilter/Makefile2
-rw-r--r--libavfilter/allfilters.c2
-rw-r--r--libavfilter/avf_showwaves.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index 8ffe703bce..7efcf6f606 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -4008,10 +4008,10 @@ tools.
@c man end VIDEO SINKS
-@chapter Transmedia Filters
-@c man begin TRANSMEDIA FILTERS
+@chapter Multimedia Filters
+@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
-@c man end TRANSMEDIA FILTERS
+@c man end MULTIMEDIA FILTERS
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index eae84fa7b8..15ca959c6e 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 f35af65119..58a3c14283 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 2494a7088f..3939fe5046 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"