From patchwork Mon Aug 22 00:09:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Gu X-Patchwork-Id: 233 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp1463308vsd; Sun, 21 Aug 2016 17:10:04 -0700 (PDT) X-Received: by 10.28.51.21 with SMTP id z21mr12304349wmz.24.1471824604113; Sun, 21 Aug 2016 17:10:04 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gy6si16012841wjc.176.2016.08.21.17.10.02; Sun, 21 Aug 2016 17:10:04 -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; 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 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 414EE689C0A; Mon, 22 Aug 2016 03:09:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pa0-f65.google.com (mail-pa0-f65.google.com [209.85.220.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9241A689B07 for ; Mon, 22 Aug 2016 03:09:13 +0300 (EEST) Received: by mail-pa0-f65.google.com with SMTP id cf3so6966026pad.2 for ; Sun, 21 Aug 2016 17:09:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+0p8T1vIDhXWk1jjPbaxUBzuQIumr3ngu+aC6pWpYro=; b=WfQxLzL5Z0KowBJRJVJvTu5hscwXd+nULDB9pNcUjHDAYlyGLvkxF3+j3KGQ3J/ZCE PrpIQ/lkJJZmpDJyIKaYWHfk+9sBZ2FtReiG+GkcFQ0PNo4hw98Jm2SPDsiClH4rEA+I d8wSxcDVm7PDnlyOerchVoHUniulpyIH9EisqOx1MzobvtafegFshAVvTDaAu/YttITQ NMMesF8PEGvJq6hUuXh06hKNLTRXX40A4DYi1TbQiyAPiCUFKkxcZmzyQEkEIdQUcIE/ TdMmI4VUSwefFiNNafR08qnnAKRnuynvj7AYsL2zXf43EpUVmYBucNeJ0zj89bqtj0sE oz4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+0p8T1vIDhXWk1jjPbaxUBzuQIumr3ngu+aC6pWpYro=; b=PpcBsqEKN+VmS8YAmSRwKpNS1Lo4W8h+1R0vDmmBB5ZbgT5ZjRu8OJfapXJq5kKtga bTh73LIRx4WQmTL6PlYFQxp1/+/c5/5B9uS4ajrDlXqAEvUAjS7F2CfRfoSuxtIBXdln qRb3WgxoQReAd77hPW63iWBaLdfOoBF0F2AkAvnUK9Y3Ck1tW5wG3C1RUy53wSmLDiaK onQcWhG50Z428rZPnK4EET8hhHcl5epu3JOpftiHf14EdJ0Ozy5H1WsqaKKDKy1SKXuH x2iY/j/+UArdbnni+qlz1wCAS3/lj1YJF5TVpr8+Sd9iWvPo1RjeemGRLan3Uiqfmp9X uEMw== X-Gm-Message-State: AEkoousm448Or61m0rkdsNSqtAvVqc1DoxnCDhBp1Zm1Mg/1cPuyYjpxWIsO268HLraIRQ== X-Received: by 10.66.164.70 with SMTP id yo6mr36620451pab.47.1471824553654; Sun, 21 Aug 2016 17:09:13 -0700 (PDT) Received: from biggie.timothygu.me (ip68-5-186-115.oc.oc.cox.net. [68.5.186.115]) by smtp.gmail.com with ESMTPSA id y3sm22400313pfd.65.2016.08.21.17.09.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 21 Aug 2016 17:09:13 -0700 (PDT) From: Timothy Gu To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Aug 2016 17:09:01 -0700 Message-Id: <1471824541-19677-2-git-send-email-timothygu99@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1471824541-19677-1-git-send-email-timothygu99@gmail.com> References: <1471824541-19677-1-git-send-email-timothygu99@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] pixfmt: Use enum assignment for aliases 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: Timothy Gu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This way, Doxygen is happier as aliases are now grouped together, and it never handled #define's in an enum well in the first place. Y400A already exists as an enum assignment. --- libavutil/pixfmt.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 6f71ac0..efc3714 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -77,7 +77,7 @@ enum AVPixelFormat { #if FF_API_XVMC AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing AV_PIX_FMT_XVMC_MPEG2_IDCT, -#define AV_PIX_FMT_XVMC AV_PIX_FMT_XVMC_MPEG2_IDCT + AV_PIX_FMT_XVMC = AV_PIX_FMT_XVMC_MPEG2_IDCT, #endif /* FF_API_XVMC */ AV_PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1 AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3 @@ -178,6 +178,7 @@ enum AVPixelFormat { AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian AV_PIX_FMT_VDA_VLD, ///< hardware decoding through VDA AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp + AV_PIX_FMT_GBR24P = AV_PIX_FMT_GBRP, // alias for #AV_PIX_FMT_GBRP AV_PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big-endian AV_PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little-endian AV_PIX_FMT_GBRP10BE, ///< planar GBR 4:4:4 30bpp, big-endian @@ -308,9 +309,6 @@ enum AVPixelFormat { AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions }; -#define AV_PIX_FMT_Y400A AV_PIX_FMT_GRAY8A -#define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP - #if AV_HAVE_BIGENDIAN # define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be #else