From patchwork Fri Jan 8 03:52:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24840 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 B84BE44B505 for ; Fri, 8 Jan 2021 06:00:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A259D689D8E; Fri, 8 Jan 2021 06:00:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8C2468A141 for ; Fri, 8 Jan 2021 06:00:41 +0200 (EET) Received: by mail-wr1-f51.google.com with SMTP id 91so7648583wrj.7 for ; Thu, 07 Jan 2021 20:00:41 -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=9iyPOjabPS28veSrcwFOhcpHyYe7b5tbz2oi5mEp/7Y=; b=NS/Giiq4PQ9vdJJ1u89Is9DxM9Gv+f+hpIeQnBlEQtDiV7HI49gnyfexvEiVh+UdSY o5r+928OKAozm2rkZm6NjSf8VsBK1B07rwDZTsoN41HGUUFQwcgld/fylHj0PYL9E8by fawA+5KIDtBcCM+DkFlTvwChGbxswRtSTNcxtD1E9gA2Hh91bK0t4xjuKBJM80yUqBbd pkFyTMc8ipbLB7ElXFWvML+gE9LMLqmzuOYn9z0Rf5FLjyplefYuSgVln1qIhDBzqQSj g3qlMsj94mqbMWgXRknqxue53FiB5aJm8e5VPxgLSu0PP1aTEWduF2fjM6zsKhJrEx1x 6FDw== 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=9iyPOjabPS28veSrcwFOhcpHyYe7b5tbz2oi5mEp/7Y=; b=j8B+pJIfGdrneeKTeIly/r8wR0mtqDjZCp1mCnrT9DVN5oDz4IsXleoFNI52/SJzVf uctjAzSs/5/Za/3hYXgUhFwaruVIyX+w6IJodcw7KWELxNcBGZojXL0ydoiIIvvpV2nB ETESy+X29oyDr2p2CONV1j/EItJbAGtKxWUTL4zARUMUonyHJx0bOebnYQnJrqmr3qUW dV6PdmAnTFRSrsZbLVnnwlJEKEMzS3w5SWM4FDmS/8O7dCLAkPV1/X7EGy+JUVHIp2Yh xfdUcuQ7prLxlkveQMJ0BhJab6CWTPT1taeM75W/q4TE9gUwfp/Bdkks923H+xVepwgU ju1w== X-Gm-Message-State: AOAM5317RdJBMm4cpwIc+3D1xJWtmpcFXgA4e7KkCN5RovUdLus4ggpn /KrKD5yNCTZv5IXRdXxGlu7flEdcQKs= X-Google-Smtp-Source: ABdhPJy9CTHumcuCZPlL1sU5mrJuCjeqR3vzNU4n6aHXJl1n8otjEkW6aGnY6Pet4e0FHAHeHWUCyg== X-Received: by 2002:adf:dd90:: with SMTP id x16mr1502501wrl.85.1610078441212; Thu, 07 Jan 2021 20:00:41 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 20:00:40 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jan 2021 04:52:06 +0100 Message-Id: <20210108035206.3261795-5-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 5/5] avcodec/Makefile: Make H.263 encoder compilable without MPEG4 encoder 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/Makefile | 3 ++- libavcodec/mpeg4videoenc.c | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c1c2322eb6..c5605ef92c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -360,7 +360,7 @@ OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o ituh263dec.o \ mpeg4video.o mpeg4videodec.o \ h263data.o OBJS-$(CONFIG_H263I_DECODER) += intelh263dec.o -OBJS-$(CONFIG_H263_ENCODER) += mpeg4videoenc.o mpeg4video.o \ +OBJS-$(CONFIG_H263_ENCODER) += mpeg4video.o \ h263.o ituh263enc.o h263data.o OBJS-$(CONFIG_H263_V4L2M2M_DECODER) += v4l2_m2m_dec.o OBJS-$(CONFIG_H263_V4L2M2M_ENCODER) += v4l2_m2m_enc.o @@ -498,6 +498,7 @@ OBJS-$(CONFIG_MPEG2_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_MPEG2_VAAPI_ENCODER) += vaapi_encode_mpeg2.o OBJS-$(CONFIG_MPEG2_V4L2M2M_DECODER) += v4l2_m2m_dec.o OBJS-$(CONFIG_MPEG4_DECODER) += xvididct.o +OBJS-$(CONFIG_MPEG4_ENCODER) += mpeg4videoenc.o OBJS-$(CONFIG_MPEG4_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_MPEG4_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_MPEG4_OMX_ENCODER) += omx.o diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index b3fa910c64..a092ab01d0 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -961,9 +961,6 @@ static void mpeg4_encode_vol_header(MpegEncContext *s, { int vo_ver_id; - if (!CONFIG_MPEG4_ENCODER) - return; - if (s->max_b_frames || s->quarter_sample) { vo_ver_id = 5; s->vo_type = ADV_SIMPLE_VO_TYPE;