From patchwork Wed May 27 04:40:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19891 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D0C82447E0E for ; Wed, 27 May 2020 08:05:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ABEDA68805A; Wed, 27 May 2020 08:05:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1826687F58 for ; Wed, 27 May 2020 08:05:36 +0300 (EEST) Received: by mail-oi1-f194.google.com with SMTP id l6so20716367oic.9 for ; Tue, 26 May 2020 22:05:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=66LLxeICZw6qeuazCh1IAX3iwi8TTjrCfvLUMf68icA=; b=eget/0KMz6ISJveWePRglYsveRTR8ZB3QZqfOkfWW2xEj9rVtNsXO+sPLwH1y8VzY6 bohr6gEq0wqtjU76wkc8wMYyE7qKoD4kXFZCp8eZ+cz8Th7UMO/uebKzVBcYLenLn4D3 0HIfTnALnAR5brQrsQk/4EInCpe1wiRKxuPvOZLliz2vloMWZ0PO8NInNsbjwWGTgQ2x Uka628ygXzQdfP+hGAh7IubDcTtz/pocAKBBfBu0h8ZXMTqSqlwfSH8R9wvUOe6TZmcx xDUkue3yWAtbKux1WtDn95BprpxWTM6qJyAh4UNcZ/WLMOLheArG8NP9Tdt5qju3sqcO uqDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=66LLxeICZw6qeuazCh1IAX3iwi8TTjrCfvLUMf68icA=; b=sxnHA+33T3o73K9mmx7yfuHvwJxFrWUqenyGfqW87+93I/cjXPakov8E/pudx+CVy9 GLqL27NhkzV9RiaIVagx4Z2ce2gMmm0Wz/TNd5oPk3RAm5pf/qFbNMl1iZgnFdr0+fxK HTcB93t1JonM6OP+Di+wkIyKan2m5Y8MSDGzoGfWSkxh0/7TZdgvGzVnC6NV6j7v5wzp qQxhTOWzd+LjElWo8/d2u8BdV9AgQEiDrbePFA1qjDJhsdO/cLtzz6/L8962n9joujCE YTABew/IJXdT81ZK4YLLr8PpTDZVidjC0mYqAIhkmYR/mIY0ayoe010H6fwwZTrjBPXy DXOg== X-Gm-Message-State: AOAM533CVzkYclQccjOveCKZVcHeFyMZ3PQOp/fdOPrP6AdJPeD3aiCH hZYMqWLGNyY7Bl8XJkpAH2rIBnvy X-Google-Smtp-Source: ABdhPJxDMuVua+SiB+dQtT6ArFev1eSs9Dxu8uOcQFd0bPGe+YZxBFS+/xtqWPHlAVHCh7Iv51CdhQ== X-Received: by 2002:a17:90a:49c5:: with SMTP id l5mr2759168pjm.73.1590554456648; Tue, 26 May 2020 21:40:56 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id y6sm889527pjn.37.2020.05.26.21.40.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2020 21:40:56 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 May 2020 12:40:45 +0800 Message-Id: <1590554445-32387-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1589800269-30359-1-git-send-email-lance.lmwang@gmail.com> References: <1589800269-30359-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 3/3] avcodec/h264dec: Add FF_CODEC_CAP_INIT_CLEANUP X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/h264dec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 47d7cbf..e463fde 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -228,7 +228,6 @@ int ff_h264_alloc_tables(H264Context *h) return 0; fail: - ff_h264_free_tables(h); return AVERROR(ENOMEM); } @@ -420,7 +419,6 @@ static av_cold int h264_decode_init(AVCodecContext *avctx) av_log(avctx, explode ? AV_LOG_ERROR: AV_LOG_WARNING, "Error decoding the extradata\n"); if (explode) { - h264_decode_end(avctx); return ret; } ret = 0; @@ -1107,7 +1105,7 @@ AVCodec ff_h264_decoder = { NULL }, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_EXPORTS_CROPPING | - FF_CODEC_CAP_ALLOCATE_PROGRESS, + FF_CODEC_CAP_ALLOCATE_PROGRESS | FF_CODEC_CAP_INIT_CLEANUP, .flush = h264_decode_flush, .update_thread_context = ONLY_IF_THREADS_ENABLED(ff_h264_update_thread_context), .profiles = NULL_IF_CONFIG_SMALL(ff_h264_profiles),