From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id BF7CF472BB for ; Mon, 4 Sep 2023 13:49:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 126DF68C71A; Mon, 4 Sep 2023 16:49:46 +0300 (EEST) Received: from mail-oa1-f43.google.com (mail-oa1-f43.google.com [209.85.160.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D70E68C1B7 for ; Mon, 4 Sep 2023 16:49:39 +0300 (EEST) Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-1c8e9d75ce1so697486fac.3 for ; Mon, 04 Sep 2023 06:49:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693835378; x=1694440178; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=um5zn+p8UWvda+sVvTO74jJojLEX/eD4xrgVi6rYBWs=; b=Ug71Eb8EYM0fqw6oOk21BVGgoA/9ax+6n1BO9dtESw8YfJ8xoxjhb9G21YOaRczaRe sXqdHzA4kBSbteeBOTd5bN6WouIzNWzi+ZjfAYe1vUKFM2LR2LQKCEeG6CfivqIERyQk yebc6PhnVne6UnVHDAaY/IcSEkZstt5KeTV7T3GmfJpX2W8zFCkta6kHxfHArzkDyOEo O9bbfguEu6A9JfrswIt07ZbJBd/2A1KZB/rgl1+x032ye7lQWBq7abMdH7nmklB2WRXc 8KBf+WHF3QwjrIcorbD+1lUk/Gwpk77Jbd6tHMe0At8pvuAA4BXgiIk9OckB7RuaaHJN pPJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693835378; x=1694440178; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=um5zn+p8UWvda+sVvTO74jJojLEX/eD4xrgVi6rYBWs=; b=fLU03WojouoGLkgDFWCdRXCWVvO+LvI+nD2NiXXu51ZA665Hx1wVDLN66uC37/QoyL w88EaEY7PIwHlhW50R+KDO2uLrLa+IAIAcX21KzbfsZS36bpitdixUGPNL9uA4KDXoHR 6SgTPqm6uqfU3iNYKvgZlmK4iKKBsox4KfaG/HSyGW/mLlXCLyM/Xm0elCIojcoFtOaw XclTCVcTEE/ik8OTRw1b9+QBik5Yc09fsoG4SHz56kDDyoGPj2mXwvpYnm++X/d6cIAU KD3BC92L8BXqvg9nRGth9yEGIJT05LGM9mdPOEW2tSRzCTQgLBUlU1/43e8CO8l8oCwI l1tw== X-Gm-Message-State: AOJu0YwUbdBIjIUPNHXsleZOmde1V7soAnaqMFSMaUXKuMkKJgdkWAQW 6T1QWm90NJK9t9UQPBTkVFO0cK5eggs= X-Google-Smtp-Source: AGHT+IEAGSxh5v78Xegwvt43zXHbLvARUiv+bpWzF7+Ni64hYBM07mUX6SpHQanC397vdMXWpXJBiA== X-Received: by 2002:a05:6870:239f:b0:1bb:eb37:1d69 with SMTP id e31-20020a056870239f00b001bbeb371d69mr10043362oap.14.1693835377460; Mon, 04 Sep 2023 06:49:37 -0700 (PDT) Received: from [192.168.0.10] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id x16-20020a056830409000b006b9cbad68a8sm830564ott.30.2023.09.04.06.49.36 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 Sep 2023 06:49:37 -0700 (PDT) Message-ID: <178b0ca4-5b08-6703-685a-9d53d5237637@gmail.com> Date: Mon, 4 Sep 2023 10:49:42 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/rv34_parser: Merge RV30 and RV40 parsers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 9/4/2023 10:44 AM, Andreas Rheinhardt wrote: > They do mostly the same. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/Makefile | 3 +-- > libavcodec/parsers.c | 3 +-- > libavcodec/rv34_parser.c | 16 ++-------------- > 3 files changed, 4 insertions(+), 18 deletions(-) > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 08fd151619..bf3b0a93f9 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -1203,8 +1203,7 @@ OBJS-$(CONFIG_OPUS_PARSER) += opus_parser.o opus_parse.o \ > OBJS-$(CONFIG_PNG_PARSER) += png_parser.o > OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o > OBJS-$(CONFIG_QOI_PARSER) += qoi_parser.o > -OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o > -OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o > +OBJS-$(CONFIG_RV34_PARSER) += rv34_parser.o > OBJS-$(CONFIG_SBC_PARSER) += sbc_parser.o > OBJS-$(CONFIG_SIPR_PARSER) += sipr_parser.o > OBJS-$(CONFIG_TAK_PARSER) += tak_parser.o tak.o > diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c > index a663b9e253..5128009cd4 100644 > --- a/libavcodec/parsers.c > +++ b/libavcodec/parsers.c > @@ -66,8 +66,7 @@ extern const AVCodecParser ff_opus_parser; > extern const AVCodecParser ff_png_parser; > extern const AVCodecParser ff_pnm_parser; > extern const AVCodecParser ff_qoi_parser; > -extern const AVCodecParser ff_rv30_parser; > -extern const AVCodecParser ff_rv40_parser; > +extern const AVCodecParser ff_rv34_parser; This afaik will break command lines like "--disable-parsers --enable-parser=rv30". I don't particularly care, or think anyone will care, but letting you know just in case. > extern const AVCodecParser ff_sbc_parser; > extern const AVCodecParser ff_sipr_parser; > extern const AVCodecParser ff_tak_parser; > diff --git a/libavcodec/rv34_parser.c b/libavcodec/rv34_parser.c > index e17bc8562d..fbc764c64f 100644 > --- a/libavcodec/rv34_parser.c > +++ b/libavcodec/rv34_parser.c > @@ -24,8 +24,6 @@ > * RV30/40 parser > */ > > -#include "config_components.h" > - > #include "parser.h" > #include "libavutil/intreadwrite.h" > > @@ -78,18 +76,8 @@ static int rv34_parse(AVCodecParserContext *s, > return buf_size; > } > > -#if CONFIG_RV30_PARSER > -const AVCodecParser ff_rv30_parser = { > - .codec_ids = { AV_CODEC_ID_RV30 }, > - .priv_data_size = sizeof(RV34ParseContext), > - .parser_parse = rv34_parse, > -}; > -#endif > - > -#if CONFIG_RV40_PARSER > -const AVCodecParser ff_rv40_parser = { > - .codec_ids = { AV_CODEC_ID_RV40 }, > +const AVCodecParser ff_rv34_parser = { > + .codec_ids = { AV_CODEC_ID_RV30, AV_CODEC_ID_RV40 }, > .priv_data_size = sizeof(RV34ParseContext), > .parser_parse = rv34_parse, > }; > -#endif _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".