diff options
Diffstat (limited to 'libavcodec/v410dec.c')
-rw-r--r-- | libavcodec/v410dec.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c index 07be502276..e7a9c0e109 100644 --- a/libavcodec/v410dec.c +++ b/libavcodec/v410dec.c @@ -3,20 +3,20 @@ * * Copyright (c) 2011 Derek Buitenhuis * - * 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 */ @@ -49,17 +49,15 @@ static int v410_decode_frame(AVCodecContext *avctx, void *data, uint8_t *src = avpkt->data; uint16_t *y, *u, *v; uint32_t val; - int i, j; + int i, j, ret; if (avpkt->size < 4 * avctx->height * avctx->width) { av_log(avctx, AV_LOG_ERROR, "Insufficient input data.\n"); return AVERROR(EINVAL); } - if (ff_get_buffer(avctx, pic, 0) < 0) { - av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n"); - return AVERROR(ENOMEM); - } + if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) + return ret; pic->key_frame = 1; pic->pict_type = AV_PICTURE_TYPE_I; |