diff options
| author | S.N. Hemanth Meenakshisundaram <smeenaks@ucsd.edu> | 2010-08-20 23:16:51 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-20 23:16:51 +0000 |
| commit | 99046339fca92d631404b47b041e98afa28659ed (patch) | |
| tree | 26b23e97aa05611c7b0bc3eacab8a527c189e296 /libavfilter | |
| parent | f59e9eaf78c28026ebc540b5767c7fe9f11590fc (diff) | |
Add null audio filter.
Patch by S.N. Hemanth Meenakshisundaram -af smeenaks,ucsd,edu.
Originally committed as revision 24856 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/Makefile | 2 | ||||
| -rw-r--r-- | libavfilter/af_anull.c | 41 | ||||
| -rw-r--r-- | libavfilter/allfilters.c | 2 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 4 |
4 files changed, 47 insertions, 2 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 72c510a4fd..443a5c62fe 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -14,6 +14,8 @@ OBJS = allfilters.o \ graphparser.o \ parseutils.o \ +OBJS-$(CONFIG_ANULL_FILTER) += af_anull.o + OBJS-$(CONFIG_ASPECT_FILTER) += vf_aspect.o OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o diff --git a/libavfilter/af_anull.c b/libavfilter/af_anull.c new file mode 100644 index 0000000000..94e7e17b48 --- /dev/null +++ b/libavfilter/af_anull.c @@ -0,0 +1,41 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * null audio filter + */ + +#include "avfilter.h" + +AVFilter avfilter_af_anull = { + .name = "anull", + .description = NULL_IF_CONFIG_SMALL("Pass the source unchanged to the output."), + + .priv_size = 0, + + .inputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .get_audio_buffer = avfilter_null_get_audio_buffer, + .filter_samples = avfilter_null_filter_samples }, + { .name = NULL}}, + + .outputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_AUDIO, }, + { .name = NULL}}, +}; diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 15596bd566..66bcf967e5 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -34,6 +34,8 @@ void avfilter_register_all(void) return; initialized = 1; + REGISTER_FILTER (ANULL, anull, af); + REGISTER_FILTER (ASPECT, aspect, vf); REGISTER_FILTER (CROP, crop, vf); REGISTER_FILTER (FORMAT, format, vf); diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 53bddecf72..5dc72e604f 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -25,8 +25,8 @@ #include "libavutil/avutil.h" #define LIBAVFILTER_VERSION_MAJOR 1 -#define LIBAVFILTER_VERSION_MINOR 36 -#define LIBAVFILTER_VERSION_MICRO 1 +#define LIBAVFILTER_VERSION_MINOR 37 +#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ |