From patchwork Fri Jun 7 00:27:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13442 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 BB3D5446125 for ; Fri, 7 Jun 2019 03:33:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A3BB368A6EE; Fri, 7 Jun 2019 03:33:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD10468A550 for ; Fri, 7 Jun 2019 03:33:27 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id 22so245907wmg.2 for ; Thu, 06 Jun 2019 17:33:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xxjAgE5FDgBWPDhHSmFMgSOr+dJgq7ytxKY/OoXHIPc=; b=G9Ldp/pWBeTy0QNgN8stm8503GZ5zvSVxlwDagwG4KlCYfgWSCF8PqAH98KvV1iWmH i2JnW9bdltYCGXt+Ym20FDYTo5hfR6h502tHtZOvfKCqFT9tlpP/x46oqc0zTiv58eNR NnUvWfUPbPsZs0P/MO/4mhe2jd7CwqgVTLFS3Pc7h/YC37sJU1cdDlXPDsupccQXx2wS Cu/pEqnChSs0KJSe5bcxowtAVlrbBy1ExF75Z8RHKR0N8WIQfrC7oy7psblOtTqc7wJ9 Y4zFUGsd51Q6EN0RKN5TJl57W7k2SHtAFTf54VIRA2fAjjGtlv/9UoGwiQoXGMq7QibW 6h5Q== 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:mime-version :content-transfer-encoding; bh=xxjAgE5FDgBWPDhHSmFMgSOr+dJgq7ytxKY/OoXHIPc=; b=PWZwdFpPcRRsJmboDGZ3XmVjyk0IcDiSEoR2iGa7eH3JQxmtho6/1RZ7umkbGhDuQB neyvdXSBzLD+LeEX3VZSaJYoHeicPdtyddTXm4DF4NtL15gESk/dK0Puf4wdRpRtS2pq wLoKhyf+lZQY1Cm7blz47i207U1ZnexQO7sUrWeYgQT1giysIfD1/bWjm56RmDG0IrwH TH11Fh5kySdFnHhZ4G16R5YjrATE/XpOlpAOmwrp7NfqzvsLfnk8O2icGchqwtR1rrVW VMJeDdEaG8JlHg7sJuYJvD4SvUlVco6MLvm9yAzMmv++dSVRUeW25w30o4iDSRRD8wqc LPOw== X-Gm-Message-State: APjAAAVADnWadmi3im0Yvov8DuLJOgJn+45VPyt7QJrBtOLX3XQRYAzo y58/tmcJ7ypOCILQi9DtT5wQ1rGn X-Google-Smtp-Source: APXvYqzG3UkjDsHUoNjwX/lLMW3h8YKppDaODb2l2v4uRePWcumKoM+JVNRh6j1uk2uLjZRwEEYn4Q== X-Received: by 2002:a1c:f105:: with SMTP id p5mr1463668wmh.87.1559867295732; Thu, 06 Jun 2019 17:28:15 -0700 (PDT) Received: from localhost.localdomain (ipbcc063db.dynamic.kabel-deutschland.de. [188.192.99.219]) by smtp.gmail.com with ESMTPSA id l7sm341638wmh.20.2019.06.06.17.28.14 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 06 Jun 2019 17:28:15 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jun 2019 02:27:11 +0200 Message-Id: <20190607002711.62880-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] cbs_av1, cbs_jpeg, cbs_mpeg2, cbs_vp9: Fix undef 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" READ has already been undefined at this point; it is obviously intended to undef WRITE. Furthermore, leb128 (in cbs_av1) was undefined too often and inconsistently. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_av1.c | 5 ++--- libavcodec/cbs_jpeg.c | 2 +- libavcodec/cbs_mpeg2.c | 2 +- libavcodec/cbs_vp9.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index eb2d03ef43..eb6b801790 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -648,7 +648,6 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) #undef xf #undef xsu #undef uvlc -#undef leb128 #undef ns #undef increment #undef subexp @@ -720,17 +719,17 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) #include "cbs_av1_syntax_template.c" -#undef READ +#undef WRITE #undef READWRITE #undef RWContext #undef xf #undef xsu #undef uvlc -#undef leb128 #undef ns #undef increment #undef subexp #undef delta_q +#undef leb128 #undef infer #undef byte_alignment diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c index 5a72f0e2e7..83857bbba2 100644 --- a/libavcodec/cbs_jpeg.c +++ b/libavcodec/cbs_jpeg.c @@ -75,7 +75,7 @@ #include "cbs_jpeg_syntax_template.c" -#undef READ +#undef WRITE #undef READWRITE #undef RWContext #undef FUNC diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index ce22e32c15..cb202f835b 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -118,7 +118,7 @@ #include "cbs_mpeg2_syntax_template.c" -#undef READ +#undef WRITE #undef READWRITE #undef RWContext #undef xui diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c index 0b5f137ed8..5579d9b0af 100644 --- a/libavcodec/cbs_vp9.c +++ b/libavcodec/cbs_vp9.c @@ -395,7 +395,7 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, #include "cbs_vp9_syntax_template.c" -#undef READ +#undef WRITE #undef READWRITE #undef RWContext #undef xf