From patchwork Fri Dec 25 15:47:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24650 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 9249544B6ED for ; Fri, 25 Dec 2020 17:53:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6BBA868AE78; Fri, 25 Dec 2020 17:53:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0222C68AA85 for ; Fri, 25 Dec 2020 17:52:58 +0200 (EET) Received: by mail-ed1-f53.google.com with SMTP id p22so4354082edu.11 for ; Fri, 25 Dec 2020 07:52:58 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=fOXJZb++16Bsh6gaKnoCflciacN1UetOSGCMH1gLLmc=; b=ndcn5ZHHvX5kd1plVb5hEDkG7VCaNSeYKX7xT4s9nT364ZfefllBtjfp78Jth1v1Mr ksBF2LgssfvSJqAAJZfIrjogDUq1Pddea9NDKJiCM8rCT5i3ZQdN9pgLNDEIQOoxe0Xj 5JHypjIxreKqqemmWr3g2FFhPd9xsqDN4UQ/9BH1Y1KGf3o6yqZ5ptdgcopqh29StV/8 LGMuWQR5xpAvuUGHxzoA/6DosDEnfJoOkdPZ9EIsQ5glWnR6BvhE5xUekVvarenbZ2xy 55FRRahX8nv+IadP7lT0f1Xsm0hvfD4lPvy6mHmcU/xKKVTz9St+QKOIz4JbFFIaah+t /OEg== 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:reply-to:mime-version:content-transfer-encoding; bh=fOXJZb++16Bsh6gaKnoCflciacN1UetOSGCMH1gLLmc=; b=frQDeYuNPcc0DaVLRDpWWi4JZ4mtBo8ae3Tkc8lvPnwFtptJ3HLIlZ/6xzag4HIvjV t3HBPdaBRTMZYWhVk0BbqfTPxziecgZAqCQvQToYQTVcYlTE2NwicV+u1BydTxRdw2xB fNrECdDc3eWdiH9NCsQBgel5puP83bMhjI7Ldg23mCxWjDEJa+pbEg/nQknuHFB9uust Npprz+Ie0GtPNQ8R7uhlEMCedjfpvt/Q+UQyKJgRu+au7nve65FvFMox8LbhvpXEposP DJKmvN79bO6plCB6WCxSd1UqxuV5ZTLjohjGNgIIuuFrthFRSQg3fua5eXZBvnvvEqm2 mXTg== X-Gm-Message-State: AOAM531CzSgl0apSRfcEcyO6SbMzYMtxQ4qzkFENfDWgglaKHU8mLy9d FcemwKf9/8tFGws+Q7gGYvtvS7NYVGk= X-Google-Smtp-Source: ABdhPJzi1ScdGzBi7KQdn5e1pizL0QFRY9JWSrFiiEJNId0snfIdg/3lQit+DXAzsa230fJkkoXQiA== X-Received: by 2002:aa7:d3d4:: with SMTP id o20mr32333152edr.190.1608911578340; Fri, 25 Dec 2020 07:52:58 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id ho12sm13733010ejc.45.2020.12.25.07.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Dec 2020 07:52:57 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Dec 2020 16:47:20 +0100 Message-Id: <20201225154724.287465-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201225154724.287465-1-andreas.rheinhardt@gmail.com> References: <20201225154724.287465-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/vc1: Don't pretend ff_vc1_init_common() can fail 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/mss2.c | 3 +-- libavcodec/vc1.c | 4 +--- libavcodec/vc1.h | 2 +- libavcodec/vc1_parser.c | 3 ++- libavcodec/vc1dec.c | 3 +-- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 9434a740a7..3e3205ae92 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -751,8 +751,7 @@ static av_cold int wmv9_init(AVCodecContext *avctx) v->s.avctx = avctx; - if ((ret = ff_vc1_init_common(v)) < 0) - return ret; + ff_vc1_init_common(v); ff_vc1dsp_init(&v->vc1dsp); v->profile = PROFILE_MAIN; diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index cd9975d8cf..5d854b35d2 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -1695,7 +1695,7 @@ static av_cold void vc1_init_static(void) * @param v The VC1Context to initialize * @return Status */ -av_cold int ff_vc1_init_common(VC1Context *v) +av_cold void ff_vc1_init_common(VC1Context *v) { static AVOnce init_static_once = AV_ONCE_INIT; @@ -1709,6 +1709,4 @@ av_cold int ff_vc1_init_common(VC1Context *v) /* VLC tables */ ff_thread_once(&init_static_once, vc1_init_static); - - return 0; } diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index 4559a06cb6..3e5368b891 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -413,7 +413,7 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex int ff_vc1_parse_frame_header (VC1Context *v, GetBitContext *gb); int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext *gb); -int ff_vc1_init_common(VC1Context *v); +void ff_vc1_init_common(VC1Context *v); int ff_vc1_decode_init_alloc_tables(VC1Context *v); void ff_vc1_init_transposed_scantables(VC1Context *v); diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c index 493ffde611..1a9d3c0140 100644 --- a/libavcodec/vc1_parser.c +++ b/libavcodec/vc1_parser.c @@ -283,7 +283,8 @@ static av_cold int vc1_parse_init(AVCodecParserContext *s) vpc->bytes_to_skip = 0; vpc->unesc_index = 0; vpc->search_state = NO_MATCH; - return ff_vc1_init_common(&vpc->v); + ff_vc1_init_common(&vpc->v); + return 0; } AVCodecParser ff_vc1_parser = { diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 5cdf197da7..78988b740c 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -434,8 +434,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; v->s.avctx = avctx; - if ((ret = ff_vc1_init_common(v)) < 0) - return ret; + ff_vc1_init_common(v); if (avctx->codec_id == AV_CODEC_ID_WMV3 || avctx->codec_id == AV_CODEC_ID_WMV3IMAGE) { int count = 0;