diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /libaf/af_resample.c | |
parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'libaf/af_resample.c')
-rw-r--r-- | libaf/af_resample.c | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/libaf/af_resample.c b/libaf/af_resample.c index 57e2d39321..c2cfb4b74f 100644 --- a/libaf/af_resample.c +++ b/libaf/af_resample.c @@ -1,14 +1,25 @@ -/*============================================================================= -// -// This software has been released under the terms of the GNU General Public -// license. See http://www.gnu.org/copyleft/gpl.html for details. -// -// Copyright 2002 Anders Johansson ajh@atri.curtin.edu.au -// -//============================================================================= -*/ +/* + * This audio filter changes the sample rate. + * + * Copyright (C) 2002 Anders Johansson ajh@atri.curtin.edu.au + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ -/* This audio filter changes the sample rate. */ #include <stdio.h> #include <stdlib.h> #include <inttypes.h> @@ -31,7 +42,7 @@ #define L16 #endif -#include "af_resample.h" +#include "af_resample_template.c" // Filtering types #define RSMP_LIN (0<<0) // Linear interpolation @@ -316,12 +327,12 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) # define FORMAT_I 1 if(s->up>s->dn){ # define UP -# include "af_resample.h" +# include "af_resample_template.c" # undef UP } else{ # define DN -# include "af_resample.h" +# include "af_resample_template.c" # undef DN } break; @@ -330,12 +341,12 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) # define FORMAT_F 1 if(s->up>s->dn){ # define UP -# include "af_resample.h" +# include "af_resample_template.c" # undef UP } else{ # define DN -# include "af_resample.h" +# include "af_resample_template.c" # undef DN } break; |