From patchwork Mon May 3 13:21:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27569 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a10:399:0:0:0:0 with SMTP id 25csp247553pxh; Mon, 3 May 2021 06:21:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxG6E/VgCB5G9v06S1B81jj3cS8PNdCiGJK+BGHU5+zllAGsFj0yqS4EbnsM6XKvsXrC5lS X-Received: by 2002:a50:eb45:: with SMTP id z5mr20094055edp.243.1620048105347; Mon, 03 May 2021 06:21:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620048105; cv=none; d=google.com; s=arc-20160816; b=hGIpiTlCfzZJywSD81cbvgksvSBx0NccZK9DBAMm2fbZ2DrkcYbNdixFjyZgUzo3WB 5xqeAWY9PhOHU3arFRpjE2SUtSTlkXsC8swDEYkmfqvF8ThTMTIWFcNI3+bzl8P/OmXo IKTV+eGgIM0qDtqKNBh3n6O1xqRZU3b3K8S0TxFc7L2UP/OrwQ76cVkzMkuN4Jj2FL5i iGg0YsOnLDD9s3RDoqaxwIMQi3aBXu8k8VOVvsoapt4N2IReVQ+282xEZGTRnJ9WVMzo qMwqLW39EyPSKUNscZ7lK0m+HHDe9M0rrjm56a4mJ2s34u3hU6YBJpqhA59dNRz2SqW4 LQKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=x49F6CNXOoWmOm1Ov54hMDhV3O87S8ZXNU/AmTdJKyE=; b=rBLXrZUqu/hoY6Gu7FqE7R8AHz6wK+iV1J4voGBFUkrdu/KFgk+RZVRx01gH8owsMR ocvIK0Q58M5s+oOTX06t3wE/boqQ487A6h+JFdxW7m+HZnfmpgha9cdpFk0wiLKt7I2N SRdFDq3fww9FEZ9Zz0jsFqieigGUdr4qxdKv2q1TKk0zdn2i+2aporn5sG+ZN63tT75c acW2E6A4XY324A6eG6Dll4xa77y7WoXs4J3YN5pxHvj9HpSJAafbBQTku4IDRvCEeEKL N3MGJ3ojlprriYOdt5ldByDnDdEzHFVM/x3C9i9NU4aT9U7mKdubjLdzwMnkUA+D+bxJ lQrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=O6Fy7Ftx; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q27si10043965eja.25.2021.05.03.06.21.44; Mon, 03 May 2021 06:21:45 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=O6Fy7Ftx; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 977406802C7; Mon, 3 May 2021 16:21:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6F366802C7 for ; Mon, 3 May 2021 16:21:33 +0300 (EEST) Received: by mail-qv1-f42.google.com with SMTP id jm10so2502168qvb.5 for ; Mon, 03 May 2021 06:21:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=xuIiAtK8zmqIPbBc9acsot7YUE3GWF5oC8ro2BSeVQw=; b=O6Fy7FtxAKV+7RiNQUs80PKmeR/3yvyEGUAXDzLQnsaH2JzEH1uU6UGgrlK1LzlNkb 8tidbP4gokbBtQ05Ubderkv4x1UQ2VTXArKBSrTi2FGb27j5haCZwkihW6/4dugQSQO7 uuSpm3G4dKRN1/RxMy2w2/6tJpHUcxONezIF4/Vysh61UHlXrewEYqxGQmfcrQj4Rf+t SpHqsM8WxGlWgGJVOOakg1NhBtDpUHJS+Kk+cOFoKn4tw24+/MLAjWydCXxrVJyP/F6o 8JZOLHUq5EZ7yuyGY2z421dBF9Qvc4Ll7TZ3WD6oWq3oZPB4u9++4JcYvgdgfbqt0dHB 0HLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=xuIiAtK8zmqIPbBc9acsot7YUE3GWF5oC8ro2BSeVQw=; b=ccxCbiBYN2f0d3XCxnx9j9sriRSNdK+VgyJUd25m/MpcSdYJIKVM7kgQWiWqbtCP4Q W/21/IAGeUKR/PmqPFHMHkWg0n3wJKfC1W96W+A19D/qMSLhFbQ99Fmx8gyJ/knOd5wI bE/TKKaj0M/2YySBsCSTXSGR3RCHqwvQIynhZwm/yKg5kfIvswB8nHIHuyWnHfWAXYb+ B62Sw3V819zPtzSIsVi6dZI0PrsPlNgwpxI/JYh+JGuljP6X/kE/sAFGtcQJ4wrowKfb QCtcm3P1i/ktkzO2f57cpywLj3fJJnnnjb+HRHSmHF9MVDX0Dpg+RJSIg2CAAcCjz/ep pALw== X-Gm-Message-State: AOAM531euRlRkb8gYmo6NUZ5yu8e0U2eLMmOi5LT1AR0JW8pnWrlAf4C VUL+0i6icsdaZ0wEgKEgHVwhRzQ/6wQ= X-Received: by 2002:a0c:f589:: with SMTP id k9mr19462071qvm.9.1620048092095; Mon, 03 May 2021 06:21:32 -0700 (PDT) Received: from localhost.localdomain ([191.83.208.172]) by smtp.gmail.com with ESMTPSA id h62sm8503619qkf.116.2021.05.03.06.21.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 06:21:31 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 May 2021 10:21:16 -0300 Message-Id: <20210503132116.1334-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/codec_id: remove unnecessary offsets from AVCodecID 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5OfQ0KcFL5V4 They are no longer required. Signed-off-by: James Almer --- libavcodec/codec_id.h | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index ab7bc68ee2..3cfa8f9459 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -246,8 +246,7 @@ enum AVCodecID { AV_CODEC_ID_MSP2, AV_CODEC_ID_VVC, #define AV_CODEC_ID_H266 AV_CODEC_ID_VVC - - AV_CODEC_ID_Y41P = 0x8000, + AV_CODEC_ID_Y41P, AV_CODEC_ID_AVRP, AV_CODEC_ID_012V, AV_CODEC_ID_AVUI, @@ -341,8 +340,7 @@ enum AVCodecID { AV_CODEC_ID_PCM_S24LE_PLANAR, AV_CODEC_ID_PCM_S32LE_PLANAR, AV_CODEC_ID_PCM_S16BE_PLANAR, - - AV_CODEC_ID_PCM_S64LE = 0x10800, + AV_CODEC_ID_PCM_S64LE, AV_CODEC_ID_PCM_S64BE, AV_CODEC_ID_PCM_F16LE, AV_CODEC_ID_PCM_F24LE, @@ -381,8 +379,7 @@ enum AVCodecID { AV_CODEC_ID_ADPCM_G722, AV_CODEC_ID_ADPCM_IMA_APC, AV_CODEC_ID_ADPCM_VIMA, - - AV_CODEC_ID_ADPCM_AFC = 0x11800, + AV_CODEC_ID_ADPCM_AFC, AV_CODEC_ID_ADPCM_IMA_OKI, AV_CODEC_ID_ADPCM_DTK, AV_CODEC_ID_ADPCM_IMA_RAD, @@ -415,8 +412,7 @@ enum AVCodecID { AV_CODEC_ID_INTERPLAY_DPCM, AV_CODEC_ID_XAN_DPCM, AV_CODEC_ID_SOL_DPCM, - - AV_CODEC_ID_SDX2_DPCM = 0x14800, + AV_CODEC_ID_SDX2_DPCM, AV_CODEC_ID_GREMLIN_DPCM, AV_CODEC_ID_DERF_DPCM, @@ -489,8 +485,7 @@ enum AVCodecID { AV_CODEC_ID_ON2AVC, AV_CODEC_ID_DSS_SP, AV_CODEC_ID_CODEC2, - - AV_CODEC_ID_FFWAVESYNTH = 0x15800, + AV_CODEC_ID_FFWAVESYNTH, AV_CODEC_ID_SONIC, AV_CODEC_ID_SONIC_LS, AV_CODEC_ID_EVRC, @@ -529,8 +524,7 @@ enum AVCodecID { AV_CODEC_ID_HDMV_PGS_SUBTITLE, AV_CODEC_ID_DVB_TELETEXT, AV_CODEC_ID_SRT, - - AV_CODEC_ID_MICRODVD = 0x17800, + AV_CODEC_ID_MICRODVD, AV_CODEC_ID_EIA_608, AV_CODEC_ID_JACOSUB, AV_CODEC_ID_SAMI, @@ -554,7 +548,7 @@ enum AVCodecID { AV_CODEC_ID_SCTE_35, ///< Contain timestamp estimated through PCR of program stream. AV_CODEC_ID_EPG, - AV_CODEC_ID_BINTEXT = 0x18800, + AV_CODEC_ID_BINTEXT, AV_CODEC_ID_XBIN, AV_CODEC_ID_IDF, AV_CODEC_ID_OTF,