diff options
Diffstat (limited to 'libavcodec/ralf.c')
| -rw-r--r-- | libavcodec/ralf.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c index bed5adfe00..3f7953c6db 100644 --- a/libavcodec/ralf.c +++ b/libavcodec/ralf.c @@ -3,20 +3,20 @@ * * Copyright (c) 2012 Konstantin Shishkov * - * 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 */ @@ -461,10 +461,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, } frame->nb_samples = ctx->max_frame_size; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "Me fail get_buffer()? That's unpossible!\n"); + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - } samples0 = (int16_t *)frame->data[0]; samples1 = (int16_t *)frame->data[1]; @@ -481,7 +479,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, init_get_bits(&gb, src + 2, table_size); ctx->num_blocks = 0; while (get_bits_left(&gb) > 0) { - ctx->block_size[ctx->num_blocks] = get_bits(&gb, 15); + ctx->block_size[ctx->num_blocks] = get_bits(&gb, 13 + avctx->channels); if (get_bits1(&gb)) { ctx->block_pts[ctx->num_blocks] = get_bits(&gb, 9); } else { |