diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 18:59:15 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 18:59:15 +0200 |
commit | b0986b3760b0174be6a58e1754353102f3230c79 (patch) | |
tree | 0c9f5a05216a547ae4ddf3b2669749f88ec3f801 /libmpcodecs/ad_speex.c | |
parent | 5fc54a6caad5f24b993da2e282c896269a6abc49 (diff) | |
parent | 23db422c3d40a5202d61b5ca154cf5286d9ac0a5 (diff) | |
download | mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.bz2 mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.xz |
Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
Diffstat (limited to 'libmpcodecs/ad_speex.c')
-rw-r--r-- | libmpcodecs/ad_speex.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/libmpcodecs/ad_speex.c b/libmpcodecs/ad_speex.c index 430d10a61d..73655e5ac1 100644 --- a/libmpcodecs/ad_speex.c +++ b/libmpcodecs/ad_speex.c @@ -1,9 +1,26 @@ -/** +/* * Speex decoder by Reimar Döffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de> - * License: GPL v2 or later + * * This code may be be relicensed under the terms of the GNU LGPL when it * becomes part of the FFmpeg project (ffmpeg.org) + * + * 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. */ + #include "config.h" #include <stdlib.h> #include <speex/speex.h> |