diff options
Diffstat (limited to 'libavcodec/dct.c')
| -rw-r--r-- | libavcodec/dct.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libavcodec/dct.c b/libavcodec/dct.c index 180477e621..52f082d062 100644 --- a/libavcodec/dct.c +++ b/libavcodec/dct.c @@ -4,20 +4,20 @@ * Copyright (c) 2010 Alex Converse <alex.converse@gmail.com> * Copyright (c) 2010 Vitor Sessak * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -178,6 +178,7 @@ av_cold int ff_dct_init(DCTContext *s, int nbits, enum DCTTransformType inverse) { int n = 1 << nbits; int i; + int ret; memset(s, 0, sizeof(*s)); @@ -190,13 +191,13 @@ av_cold int ff_dct_init(DCTContext *s, int nbits, enum DCTTransformType inverse) ff_init_ff_cos_tabs(nbits + 2); s->costab = ff_cos_tabs[nbits + 2]; - s->csc2 = av_malloc(n / 2 * sizeof(FFTSample)); + s->csc2 = av_malloc_array(n / 2, sizeof(FFTSample)); if (!s->csc2) return AVERROR(ENOMEM); - if (ff_rdft_init(&s->rdft, nbits, inverse == DCT_III) < 0) { - av_free(s->csc2); - return -1; + if ((ret = ff_rdft_init(&s->rdft, nbits, inverse == DCT_III)) < 0) { + av_freep(&s->csc2); + return ret; } for (i = 0; i < n / 2; i++) @@ -220,5 +221,5 @@ av_cold int ff_dct_init(DCTContext *s, int nbits, enum DCTTransformType inverse) av_cold void ff_dct_end(DCTContext *s) { ff_rdft_end(&s->rdft); - av_free(s->csc2); + av_freep(&s->csc2); } |