diff options
Diffstat (limited to 'libavcodec/smc.c')
| -rw-r--r-- | libavcodec/smc.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libavcodec/smc.c b/libavcodec/smc.c index c6541da843..131300a595 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -1,21 +1,21 @@ /* * Quicktime Graphics (SMC) Video Decoder - * Copyright (C) 2003 the ffmpeg project + * Copyright (c) 2003 The FFmpeg Project * - * 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 */ @@ -84,7 +84,7 @@ static void smc_decode_stream(SmcContext *s) int stride = s->frame->linesize[0]; int i; int chunk_size; - int buf_size = (int) (s->gb.buffer_end - s->gb.buffer_start); + int buf_size = bytestream2_size(&s->gb); unsigned char opcode; int n_blocks; unsigned int color_flags; @@ -436,10 +436,8 @@ static int smc_decode_frame(AVCodecContext *avctx, bytestream2_init(&s->gb, buf, buf_size); - if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) { - av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); + if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) return ret; - } if (pal) { s->frame->palette_has_changed = 1; |