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/shorten.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/shorten.c')
-rw-r--r-- | src/libffmpeg/libavcodec/shorten.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/libffmpeg/libavcodec/shorten.c b/src/libffmpeg/libavcodec/shorten.c index fe956bc39..358ecf23f 100644 --- a/src/libffmpeg/libavcodec/shorten.c +++ b/src/libffmpeg/libavcodec/shorten.c @@ -2,18 +2,20 @@ * Shorten decoder * Copyright (c) 2005 Jeff Muizelaar * - * 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 */ @@ -334,7 +336,7 @@ static int shorten_decode_frame(AVCodecContext *avctx, s->nwrap = FFMAX(NWRAP, maxnlpc); if (allocate_buffers(s)) - return -1; + return -1; init_offset(s); |