diff options
Diffstat (limited to 'libavcodec/xl.c')
| -rw-r--r-- | libavcodec/xl.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/libavcodec/xl.c b/libavcodec/xl.c index 8e9bdc66f6..2d1da1d255 100644 --- a/libavcodec/xl.c +++ b/libavcodec/xl.c @@ -2,20 +2,20 @@ * Miro VideoXL codec * Copyright (c) 2004 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 */ @@ -50,19 +50,16 @@ static int decode_frame(AVCodecContext *avctx, int y0, y1, y2, y3 = 0, c0 = 0, c1 = 0; if (avctx->width % 4) { - av_log(avctx, AV_LOG_ERROR, "Width not a multiple of 4.\n"); + av_log(avctx, AV_LOG_ERROR, "width is not a multiple of 4\n"); return AVERROR_INVALIDDATA; } - if (buf_size < avctx->width * avctx->height) { av_log(avctx, AV_LOG_ERROR, "Packet is too small\n"); return AVERROR_INVALIDDATA; } - if ((ret = ff_get_buffer(avctx, p, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) return ret; - } p->pict_type = AV_PICTURE_TYPE_I; p->key_frame = 1; |