diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2006-12-04 22:25:13 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2006-12-04 22:25:13 +0000 |
| commit | e6d1a700e06ba8a985c29ba212b359c9e33bcc55 (patch) | |
| tree | 3c98db75ad4f78f4e44c9c6bf974cfff704d1ce2 /src/libffmpeg/libavcodec/ws-snd1.c | |
| parent | e8bcf74e1a8a78e15d3d147f1d485c07a5ac3cd6 (diff) | |
| download | xine-lib-e6d1a700e06ba8a985c29ba212b359c9e33bcc55.tar.gz xine-lib-e6d1a700e06ba8a985c29ba212b359c9e33bcc55.tar.bz2 | |
trying an updated ffmpeg version (51.25.0)
CVS patchset: 8405
CVS date: 2006/12/04 22:25:13
Diffstat (limited to 'src/libffmpeg/libavcodec/ws-snd1.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/ws-snd1.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/libffmpeg/libavcodec/ws-snd1.c b/src/libffmpeg/libavcodec/ws-snd1.c index aa85b4526..eb4fe81d3 100644 --- a/src/libffmpeg/libavcodec/ws-snd1.c +++ b/src/libffmpeg/libavcodec/ws-snd1.c @@ -2,18 +2,20 @@ * Westwood SNDx codecs * Copyright (c) 2005 Konstantin Shishkov * - * This library is free software; you can redistribute it and/or + * 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * 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 this library; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avcodec.h" @@ -27,9 +29,6 @@ * http://www.multimedia.cx */ -typedef struct { -} WSSNDContext; - static const char ws_adpcm_2bit[] = { -2, -1, 0, 1}; static const char ws_adpcm_4bit[] = { -9, -8, -6, -5, -4, -3, -2, -1, @@ -137,7 +136,7 @@ AVCodec ws_snd1_decoder = { "ws_snd1", CODEC_TYPE_AUDIO, CODEC_ID_WESTWOOD_SND1, - sizeof(WSSNDContext), + 0, ws_snd_decode_init, NULL, NULL, |