diff options
Diffstat (limited to 'libavcodec/huffyuv.c')
-rw-r--r-- | libavcodec/huffyuv.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index d4cf6fa980..c183bdf075 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -6,20 +6,20 @@ * see http://www.pcisys.net/~melanson/codecs/huffyuv.txt for a description of * the algorithm used * - * 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 */ @@ -35,13 +35,13 @@ #include "avcodec.h" #include "huffyuv.h" -int ff_huffyuv_generate_bits_table(uint32_t *dst, const uint8_t *len_table) +int ff_huffyuv_generate_bits_table(uint32_t *dst, const uint8_t *len_table, int n) { int len, index; uint32_t bits = 0; for (len = 32; len > 0; len--) { - for (index = 0; index < 256; index++) { + for (index = 0; index < n; index++) { if (len_table[index] == len) dst[index] = bits++; } @@ -60,9 +60,10 @@ av_cold int ff_huffyuv_alloc_temp(HYuvContext *s) if (s->bitstream_bpp<24) { for (i=0; i<3; i++) { - s->temp[i]= av_malloc(s->width + 16); + s->temp[i]= av_malloc(2*s->width + 16); if (!s->temp[i]) return AVERROR(ENOMEM); + s->temp16[i] = (uint16_t*)s->temp[i]; } } else { s->temp[0]= av_mallocz(4*s->width + 16); @@ -83,14 +84,16 @@ av_cold void ff_huffyuv_common_init(AVCodecContext *avctx) s->width = avctx->width; s->height = avctx->height; - assert(s->width>0 && s->height>0); + + av_assert1(s->width > 0 && s->height > 0); } -void ff_huffyuv_common_end(HYuvContext *s) +av_cold void ff_huffyuv_common_end(HYuvContext *s) { int i; for(i = 0; i < 3; i++) { av_freep(&s->temp[i]); + s->temp16[i] = NULL; } } |