From patchwork Fri Jan 8 03:52:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24839 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 C20F944B505 for ; Fri, 8 Jan 2021 06:00:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A458689E56; Fri, 8 Jan 2021 06:00:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA86C689D59 for ; Fri, 8 Jan 2021 06:00:40 +0200 (EET) Received: by mail-wr1-f42.google.com with SMTP id 91so7648555wrj.7 for ; Thu, 07 Jan 2021 20:00:40 -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=m2hNn92zKY4gevQU6FyKi/qMmMfevx9Nmcs7j02hrNw=; b=pH+bIUcYQbiFciwBfZ7yqwJIEzLjvmxcV04B5U8g2EVxGH0Gjzqz9K84IjIcIZPrcW PYoTS+2U7yHvlUSFoOJPB1AEFMFpFcgWCwxJwPCxNWaFXJipeXAPVEBuae1VC8FWxt1g NU+sKF4enhaSKus8DikBf9/qQUrpLL5PnYF+IP5LoEMu8XWo3HpFDIOhH+LfnhmqbFR0 /405Gq2ytbXf8W8m0GBs0VfhQfCutKs2IW+IydyD5c6s6QgcQA8VVi5NCzxh2U4PTyVI cD4QJ2k+QxNSiz7/M+VLQemsz3grur6yGrt7mgpXsLKTIpDmRdg2RWY7nfKh69Bq1k8M V31Q== 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=m2hNn92zKY4gevQU6FyKi/qMmMfevx9Nmcs7j02hrNw=; b=dRwQLxqthmRiZya8VpTYgmJ74LwwV8z2vJnOyFuQUwh+4F8SHvDwJVWFoqVKY7i3sA fhsASHKTk+sQn5XxVEVDcWEt9Wu/4aFdY7K0UkK2aIe1XEFcyRwEsZsAxCkKP3R25v4j uR2ek56WSLlgFA4ekM9sesZ95T69xjWS6Aj+kCoyDAKPA6qMZZ56K5sSEi9wuTzmSnOf pyTK6YJCW9ih6/jUIFzbmXpthVKcmFJpDX6SpU8YLNWEg6cv9nzIvGPtzFLmHFeKVxUB +kHXD4NWjT4wm5AdFZK+S4ed7DFWcDKFzf6ShiKYo0c1oBqJlWPZeTYxG2mACb4ohAg+ l6pw== X-Gm-Message-State: AOAM532LE6eHGyvt6DtFlH7qtZ07MUPdwFvkLpAJpNqGjIutUt/+A0VZ P/WRku9b60d4O1mKsnKvdlmr+6xG1+Y= X-Google-Smtp-Source: ABdhPJzqZr1N64LSypC2YhoWNRTsX50z/FwmnTWhiyRzisOZjwhaD7DcyvuP9blkJCyWhEMEaZVlbQ== X-Received: by 2002:a5d:4f90:: with SMTP id d16mr1539551wru.120.1610078440273; Thu, 07 Jan 2021 20:00:40 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id c190sm10048459wme.19.2021.01.07.20.00.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 20:00:39 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jan 2021 04:52:05 +0100 Message-Id: <20210108035206.3261795-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210108035206.3261795-1-andreas.rheinhardt@gmail.com> References: <20210108035206.3261795-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/Makefile: Make H.263 decoder compilable without H.263I 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" The only call to ff_intel_h263_decode_picture_header() is already behind "if (CONFIG_H263I_DECODER)". Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 4c1044a281..c1c2322eb6 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -358,7 +358,8 @@ OBJS-$(CONFIG_H261_DECODER) += h261dec.o h261data.o h261.o OBJS-$(CONFIG_H261_ENCODER) += h261enc.o h261data.o h261.o OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o ituh263dec.o \ mpeg4video.o mpeg4videodec.o \ - intelh263dec.o h263data.o + h263data.o +OBJS-$(CONFIG_H263I_DECODER) += intelh263dec.o OBJS-$(CONFIG_H263_ENCODER) += mpeg4videoenc.o mpeg4video.o \ h263.o ituh263enc.o h263data.o OBJS-$(CONFIG_H263_V4L2M2M_DECODER) += v4l2_m2m_dec.o