X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ftwolame.c;h=092fd7db8a35c1e8e4617cf370c7ff84d0f31053;hb=099e253c24363da7194d49bc24f2208baf07adcf;hp=fb515c712b5a8c803d64111809de1588704aada3;hpb=940cf07d668f41d3d01ff87f4647afc37b4dca80;p=vlc diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c index fb515c712b..092fd7db8a 100644 --- a/modules/codec/twolame.c +++ b/modules/codec/twolame.c @@ -2,23 +2,23 @@ * twolame.c: libtwolame encoder (MPEG-1/2 layer II) module * (using libtwolame from http://www.twolame.org/) ***************************************************************************** - * Copyright (C) 2004-2005 the VideoLAN team + * Copyright (C) 2004-2005 VLC authors and VideoLAN * $Id$ * * Authors: Christophe Massiot * Gildas Bazin * - * This program 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 + * This program 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. * * This program 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. + * 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 General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ @@ -286,7 +286,7 @@ static block_t *Encode( encoder_t *p_enc, block_t *p_aout_buf ) p_sys->p_buffer, MPEG_FRAME_SIZE, p_sys->p_out_buffer, MAX_CODED_FRAME_SIZE ); p_sys->i_nb_samples = 0; - p_block = block_New( p_enc, i_used ); + p_block = block_Alloc( i_used ); memcpy( p_block->p_buffer, p_sys->p_out_buffer, i_used ); p_block->i_length = (mtime_t)1000000 * (mtime_t)MPEG_FRAME_SIZE / (mtime_t)p_enc->fmt_out.audio.i_rate;