From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 907E946DAD for ; Tue, 11 Jul 2023 17:17:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 910C968C5BC; Tue, 11 Jul 2023 20:17:23 +0300 (EEST) Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A52B368C3E7 for ; Tue, 11 Jul 2023 20:17:17 +0300 (EEST) Received: by mail-ot1-f48.google.com with SMTP id 46e09a7af769-6b74e2d8c98so5234984a34.2 for ; Tue, 11 Jul 2023 10:17:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689095836; x=1691687836; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Wndv2rKuk2JIzdSyFirggKMxnYog7RDJ+MSgfUDXDFA=; b=SyeRNtu8vxg6sF1BrcflM9N7Yt3EGERb38sxAUVhz8U0QJTNeEIGmCploO2vA3lsI0 QlXgHvNWBXqB8ws9Cqvb4Au0Ytxob3G1XsmcBODyw2DAEjQwo2KHdhtrh+9wqZrRx9bg IY9ckSPGVw706nfFNRUZmQvgOPaEoi7N5z6/06r1xsASOdqvjvurbuF2QbakTNFsmVb5 PIgVxbRVKVS9Ehzxi4tJvc5frCcOzxVkBhbK9kY2o8l9aHg9omlEPtauYq0gLUmMbKAm H3Wjm9V7djAMT0G+Q7aU0pBsuOZinEab0pIc2HHuhfSDEtC9z/6hVqSmAMsSP1MUqiSn lIqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689095836; x=1691687836; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Wndv2rKuk2JIzdSyFirggKMxnYog7RDJ+MSgfUDXDFA=; b=J0XdTCOhRtP3pSZp/pLRUxAtycMzBDQ5mtWBGTLbU3J4OV+eizDMBNF58u0CRC/RsG G/se01iAPt/rCjQQNrTraZ7xz+6XZK8FwK9YGQyVL48SMvV9bXeKnxXrrKyz6bJrcahI Q1pxMf97+pGCGb8hgWwl6R5+7q6wano9C826kgjmo5TdOYGO3RRzNJMgjaeUe3jHjM8E Pmk4GR2cS+BatzKHmoOIgE272tSGUv5LFrB5ZrtauuryX/6mjybdc/RFzPnV4SlGQPbj qAfHUqYedfsZE+bvmbJtH8v/q93Rx/z5hxQVIz5DfBPQARdZTrlpRE6IUae/dcWhhHaJ poag== X-Gm-Message-State: ABy/qLYP1os3krnFtMRWXPUflK4tORY68mrMRM5wbwueCR0l5P7o8o0o VJLmwNrKvJqwo27LCQmgzsKMF0q+5HI= X-Google-Smtp-Source: APBJJlE5NHc6EObpzXzDUQtuGECGG4T/0PX2WBpiV/bve/+vrXfcj2YWTMsbNuNuEynwfJSEDqIu7A== X-Received: by 2002:a9d:7487:0:b0:6b6:382a:a5f6 with SMTP id t7-20020a9d7487000000b006b6382aa5f6mr15661771otk.21.1689095835623; Tue, 11 Jul 2023 10:17:15 -0700 (PDT) Received: from [192.168.0.16] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id e26-20020a9d63da000000b006b46b913767sm1128038otl.24.2023.07.11.10.17.14 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 11 Jul 2023 10:17:15 -0700 (PDT) Message-ID: Date: Tue, 11 Jul 2023 14:17:14 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230711171223.11878-1-anton@khirnov.net> From: James Almer In-Reply-To: <20230711171223.11878-1-anton@khirnov.net> Subject: Re: [FFmpeg-devel] [PATCH] lavc/gifdec: unify get_buffer() calls I/P frames X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 7/11/2023 2:12 PM, Anton Khirnov wrote: > Always call ff_reget_buffer(), which ensures that get_buffer2() is > called with AV_GET_BUFFER_FLAG_REF. > > Fixes #10460. > --- > libavcodec/gifdec.c | 29 +++++++++++------------------ > 1 file changed, 11 insertions(+), 18 deletions(-) > > diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c > index f2ab783ef0..af65baabd5 100644 > --- a/libavcodec/gifdec.c > +++ b/libavcodec/gifdec.c > @@ -489,29 +489,22 @@ static int gif_decode_frame(AVCodecContext *avctx, AVFrame *rframe, > return ret; > > av_frame_unref(s->frame); > - if ((ret = ff_get_buffer(avctx, s->frame, 0)) < 0) > - return ret; > - > av_fast_malloc(&s->idx_line, &s->idx_line_size, s->screen_width); > if (!s->idx_line) > return AVERROR(ENOMEM); > - > - s->frame->pict_type = AV_PICTURE_TYPE_I; > - s->frame->flags |= AV_FRAME_FLAG_KEY; > - s->keyframe_ok = 1; > - } else { > - if (!s->keyframe_ok) { > - av_log(avctx, AV_LOG_ERROR, "cannot decode frame without keyframe\n"); > - return AVERROR_INVALIDDATA; > - } > - > - if ((ret = ff_reget_buffer(avctx, s->frame, 0)) < 0) > - return ret; > - > - s->frame->pict_type = AV_PICTURE_TYPE_P; > - s->frame->flags &= ~AV_FRAME_FLAG_KEY; > + } else if (!s->keyframe_ok) { > + av_log(avctx, AV_LOG_ERROR, "cannot decode frame without keyframe\n"); > + return AVERROR_INVALIDDATA; > } > > + ret = ff_reget_buffer(avctx, s->frame, 0); > + if (ret < 0) > + return ret; > + > + s->frame->pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; > + s->frame->flags = AV_FRAME_FLAG_KEY * s->keyframe; There's code setting these two in rframe below the gif_parse_next_image() call, so maybe change it to this instead, and remove the duplication. > + s->keyframe_ok |= !!s->keyframe; > + > ret = gif_parse_next_image(s, s->frame); > if (ret < 0) > return ret; _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".