diff options
Diffstat (limited to 'libavcodec/cngenc.c')
| -rw-r--r-- | libavcodec/cngenc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/cngenc.c b/libavcodec/cngenc.c index 98f3c4e91a..58918aa958 100644 --- a/libavcodec/cngenc.c +++ b/libavcodec/cngenc.c @@ -2,20 +2,20 @@ * RFC 3389 comfort noise generator * Copyright (c) 2012 Martin Storsjo * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * 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.1 of the License, or (at your option) any later version. * - * Libav 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 Libav; 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 */ @@ -56,8 +56,8 @@ static av_cold int cng_encode_init(AVCodecContext *avctx) p->order = 10; if ((ret = ff_lpc_init(&p->lpc, avctx->frame_size, p->order, FF_LPC_TYPE_LEVINSON)) < 0) return ret; - p->samples32 = av_malloc(avctx->frame_size * sizeof(*p->samples32)); - p->ref_coef = av_malloc(p->order * sizeof(*p->ref_coef)); + p->samples32 = av_malloc_array(avctx->frame_size, sizeof(*p->samples32)); + p->ref_coef = av_malloc_array(p->order, sizeof(*p->ref_coef)); if (!p->samples32 || !p->ref_coef) { cng_encode_close(avctx); return AVERROR(ENOMEM); @@ -87,7 +87,7 @@ static int cng_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, energy /= frame->nb_samples; if (energy > 0) { double dbov = 10 * log10(energy / 1081109975); - qdbov = av_clip(-floor(dbov), 0, 127); + qdbov = av_clip_uintp2(-floor(dbov), 7); } else { qdbov = 127; } |