virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

lavfi: change "transmedia" into "multimedia".

Browse Source
This commit is contained in:
Nicolas George 2012-07-23 11:44:48 +02:00
parent be33da9a1d
commit 612307978d
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/filters.texi
View File

@ -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

2
libavfilter/Makefile
View File

@ -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

2
libavfilter/allfilters.c
View File

@ -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);

2
libavfilter/avf_showwaves.c
View File

@ -20,7 +20,7 @@
/**
* @file
* audio to video transmedia filter
* audio to video multimedia filter
*/
#include "libavutil/audioconvert.h"