From patchwork Fri Jan 8 03:52:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24836 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 8E3D244B505 for ; Fri, 8 Jan 2021 06:00:22 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 606A9688057; Fri, 8 Jan 2021 06:00:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0E0C687F85 for ; Fri, 8 Jan 2021 06:00:16 +0200 (EET) Received: by mail-ej1-f49.google.com with SMTP id ce23so12732416ejb.8 for ; Thu, 07 Jan 2021 20:00:16 -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:reply-to:mime-version :content-transfer-encoding; bh=NlN0mRJ1kNlvUrEUuc/ilV9LXqGn0ASiLlEEobl8HjY=; b=eEyhmQZUhFEyx7DYhhN5ZKJ/0Pt0h7Ibf+PiI367gty5rAk4X5NvMZ/zXK++MlBrKi XwaJ90wqljfAW/qfcToNByvgbas8PJVMI6BFdE3kTkcybrX8bw7CI1JW3X3Tl7xXmGzO tJd3yhcND//pNokXu5O7Xa8p0x6sKNcsWpxItUNzP7nBvArWiLt2sa9LcpFWMeRMZd8x 9lwIl3gLbU5eprAvR2ohRPvfwCfg6FqjA5FlHcAB5sZsmczng/jqsiUNCHrZu2swgxR8 pGtXk0LUJZTbYhVieVXYo3nR0YxwCeGKBcTOBjyf0aCVg+C09lt3owPAPJjpWnem18Qt t7rA== 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:reply-to :mime-version:content-transfer-encoding; bh=NlN0mRJ1kNlvUrEUuc/ilV9LXqGn0ASiLlEEobl8HjY=; b=ro8Q0/EJkP1cf84Lv8NirWjiB6m9qPgNMjjSeqosL5Y0Ru91KRzEypwVLDY/mHmBJG 4tLlNPgZWcWAxJb+z7VyLC4KVoHABMNddpkRdZAyb7IuI3874FvaO641QxvcZoUYnhzd D05goKVY4oEFsHIOta2WrEARpXKBKU9wcIpOwUWtdUdPEhk9jCwVX+v0DoCR+8fIdgzC CO62zaCp4t9HPDtma9HXl3akalRgbkvST5LTEAwZyBx/kPnQ/Bf+u335LeOWlhbPPfcJ 4lRCsKIWy0//fC7YnH8izb/o0UtK+5paQSwUeIQlCiF9Jg1usd7lpfLReZq19/Goa1Jk OTtQ== X-Gm-Message-State: AOAM530lLCgRz9xRv7o37eovBraHIPtkQFXVVGvE5otoJfkaartTKw6P r1LsAwxEbBITwmtxJQ9vMV/1XsLRj8Y= X-Google-Smtp-Source: ABdhPJxY505ykd2XXQ7mr94o63CptsQzUu0BP6XxtIl03u++Aq7LG3argThjO2LCUBAt6aq0S6NedQ== X-Received: by 2002:adf:eec7:: with SMTP id a7mr1542029wrp.45.1610077933523; Thu, 07 Jan 2021 19:52:13 -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.19.52.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 19:52:12 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jan 2021 04:52:02 +0100 Message-Id: <20210108035206.3261795-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/Makefile: Remove unnecessary cbrt_data dependency 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fea37ef3c9..36891bbb57 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -174,7 +174,7 @@ OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o aacenctab.o \ aacenc_tns.o \ aacenc_ltp.o \ aacenc_pred.o \ - psymodel.o mpeg4audio.o kbdwin.o cbrt_data.o + psymodel.o mpeg4audio.o kbdwin.o OBJS-$(CONFIG_AAC_MF_ENCODER) += mfenc.o mf_utils.o OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o OBJS-$(CONFIG_AC3_DECODER) += ac3dec_float.o ac3dec_data.o ac3.o kbdwin.o ac3tab.o From patchwork Fri Jan 8 03:52:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24837 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 BAC0E44B505 for ; Fri, 8 Jan 2021 06:00:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A4CB6689A8B; Fri, 8 Jan 2021 06:00:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C6D8688078 for ; Fri, 8 Jan 2021 06:00:39 +0200 (EET) Received: by mail-wr1-f49.google.com with SMTP id c5so7627072wrp.6 for ; Thu, 07 Jan 2021 20:00:39 -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=PAa/GERzUUzyPMJWw4FaV0gdMRNQ/ihqq1BjpXxq9RQ=; b=mRo88TabErld8qCcDtYtIiAn4JclBltxcj5K8ZlxzKdX9vfH4Qjuz9tbR+TNGcUEWe 9plMvkzIKP1NKCAJ8ugsyfAglr8YhoYxsXhZPf+/OGJeq8VPp3X9ndenetaEgI7WN062 ORZkc0EU5t4OIQOeRPbGQLPfQ0wAW5cx5IEH12xnVdT3cN5ybZLCF2774v2I7IZ03wm0 fkugZB2k8A4Bru0rhGCjejA6v/cj9cne0ZxbNUs1FYbGo08BTFbLDdPAiOTpVjlX56RT xnJRTiULKvpRVrkrVlG3gTMdp3RApm23pEwwRHmZR0sMsDiLFJsvT4hyMX5VQUIIuRDE YGlA== 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=PAa/GERzUUzyPMJWw4FaV0gdMRNQ/ihqq1BjpXxq9RQ=; b=r3LMrb8gd+r5kFz9aLit7owFdRM5HAqvH1NK82CA7yXn3/gYUOqbRLpnxAZymXE265 QIROTtTu+R6OndHnQfYI0iO+YbpQrknhJLUvBpazkhMMXdlR0Fcv1JlnGsCRVHEl0imj glDopH4widR/zJsCfEEhd+MHvi9O0//DXelP6236LsZYg/s94bRasi4yOc99O1M+FYtt FJ7awwjVdzyEM2WMlwZks/XrEj2X4xtYySYlKVOfCelMkdRAV87hhr2M+bW6eS17wW2S 44gcbH5ZXSpzf0jEEGFIsbM6JyzRz2oTCYdsxYt8OOoCmk1JXQ7Oks2JWhpbuUUFYmda 619Q== X-Gm-Message-State: AOAM533f2j3GDirVcJl636aTH6hI6D4s5ckEIkuQKNcM324moXSr8nHZ GaHhQcprCk47UbFAYt4ajluwJrXJ2K4= X-Google-Smtp-Source: ABdhPJx9D3jkHDjNYjOT5s2jqLTDzWl7Zh3g0LAYdo3dtL6HZQa+CK6KhpLUg9GIGJws3Nu8AaqaMA== X-Received: by 2002:a5d:61c4:: with SMTP id q4mr1554121wrv.304.1610078438580; Thu, 07 Jan 2021 20:00:38 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 20:00:37 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jan 2021 04:52:03 +0100 Message-Id: <20210108035206.3261795-2-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 2/5] avcodec/Makefile: Remove dependency of H.263 on FLV codecs 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 36891bbb57..a711eeeb81 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -336,6 +336,8 @@ OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o OBJS-$(CONFIG_FLASHSV2_ENCODER) += flashsv2enc.o OBJS-$(CONFIG_FLASHSV2_DECODER) += flashsv.o OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o +OBJS-$(CONFIG_FLV_DECODER) += flvdec.o +OBJS-$(CONFIG_FLV_ENCODER) += flvenc.o OBJS-$(CONFIG_FMVC_DECODER) += fmvc.o OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o @@ -355,10 +357,10 @@ OBJS-$(CONFIG_GSM_MS_DECODER) += gsmdec.o gsmdec_data.o msgsmdec.o 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 flvdec.o\ + mpeg4video.o mpeg4videodec.o \ intelh263dec.o h263data.o OBJS-$(CONFIG_H263_ENCODER) += mpeg4videoenc.o mpeg4video.o \ - h263.o ituh263enc.o flvenc.o h263data.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 OBJS-$(CONFIG_H264_DECODER) += h264dec.o h264_cabac.o h264_cavlc.o \ From patchwork Fri Jan 8 03:52:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24838 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 95F8144B505 for ; Fri, 8 Jan 2021 06:00:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 82ED4689D59; Fri, 8 Jan 2021 06:00:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14D09688078 for ; Fri, 8 Jan 2021 06:00:40 +0200 (EET) Received: by mail-wm1-f54.google.com with SMTP id v14so6758346wml.1 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=b+9CvSUDsnLV3kqHtZqUIY3fItKt7dkBBNRe+Fx9t30=; b=GyAfHjsV5PPoFPDayE/+8a/Z68pnZoXnH2XGiwE0Dp1KkO6gTcdVoIjPWKg1/EDnIv xGqSsiJKNDUFqj+7c78OM5dll+hBY8cUStZRpPGDjdQ1XuzZJhNUeoVXu4DrvQbmzlzO C49X8f11nNBAfz/pLBbW4stegUcjOgmGWJS5s65uxhPEIRZBHTaxFP+Rc8yzOpRKU5An BUAOuUsfqTrwLTaAgOvsjSk8drAbvcVIl+fdXBjE4+AuMvHX5F/aq+OQGTjoNssV1sL1 1ubVkN7DigxedHLcgMe5bLvFrcfhzV29TN30NhxqENtIOgIAuIKemJU/+WwX+s6bANDw VB2A== 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=b+9CvSUDsnLV3kqHtZqUIY3fItKt7dkBBNRe+Fx9t30=; b=TgAu+de11iAGHl9LoLR6X7prxbLKU43BTcAfGYXVsj8U6Waphx4eB9Y2IUueIQ3j8M mHwiaLxniXvTXlqoq9NgLcVgVAO7moFSNStZbwFIRoudCKlrjtELeHDQKo2gfm3Agl7a 8gA8iRgCbXDCIbhD/G+2QCsFzwoa1WsjfzT7vdbTJCpPcHc9Sh5Vy1mF268Srhj9/VOm jgLzkZHc1JYby2kiTHcwN6vuavwh04kUgkZt9R5LD7gU+AcQeW8QcJ2/qkNpONP0B6WF xIltjFvpuUrdim/0HUVSAd7CLK32o51Q9sdkpXEmGn/MYzfX5gjppeUzoFrtPcZTItV+ vxmg== X-Gm-Message-State: AOAM53197qFC0m6kYGNPqhuoXREyVEi6d/r/IFu2DTt4NLF/bgTfzB09 rmYxOB+1vCuw24R/i5lkMmZlxH0GbPo= X-Google-Smtp-Source: ABdhPJzYMfMezzSVWW5F6bZ7/Y5lTfHIbha12MW/cW659DBes8cUWZvNjkbXGPOuHxEYKGzHXbaY3A== X-Received: by 2002:a1c:c287:: with SMTP id s129mr1248383wmf.79.1610078439432; Thu, 07 Jan 2021 20:00:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 20:00:38 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jan 2021 04:52:04 +0100 Message-Id: <20210108035206.3261795-3-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 3/5] avcodec/Makefile: Remove FLAC dependencies on vorbis_data 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" 2ef2496cd19eb833f4ad22a5051c11be80d09598 used ff_vorbis_channel_layouts in flac.c, but added a dependency to the FLAC decoder only; lateron aba0278e9fe8e66c078588efe66f6af4db432770 added the dependency of the FLAC parser and encoder on vorbis_data.o. Yet when the original commit was reverted in aba0278e9fe8e66c078588efe66f6af4db432770, the two other dependencies were not removed. This commit fixes this. Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a711eeeb81..4c1044a281 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -330,7 +330,7 @@ OBJS-$(CONFIG_FIC_DECODER) += fic.o OBJS-$(CONFIG_FITS_DECODER) += fitsdec.o fits.o OBJS-$(CONFIG_FITS_ENCODER) += fitsenc.o OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o -OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o flacdata.o flac.o vorbis_data.o +OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o flacdata.o flac.o OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o OBJS-$(CONFIG_FLASHSV2_ENCODER) += flashsv2enc.o @@ -1090,8 +1090,7 @@ OBJS-$(CONFIG_DVAUDIO_PARSER) += dvaudio_parser.o OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsub_parser.o OBJS-$(CONFIG_DVD_NAV_PARSER) += dvd_nav_parser.o OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsub_parser.o -OBJS-$(CONFIG_FLAC_PARSER) += flac_parser.o flacdata.o flac.o \ - vorbis_data.o +OBJS-$(CONFIG_FLAC_PARSER) += flac_parser.o flacdata.o flac.o OBJS-$(CONFIG_G723_1_PARSER) += g723_1_parser.o OBJS-$(CONFIG_G729_PARSER) += g729_parser.o OBJS-$(CONFIG_GIF_PARSER) += gif_parser.o 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 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;