From patchwork Fri Nov 24 12:36:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 6333 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp2103943jah; Fri, 24 Nov 2017 04:36:18 -0800 (PST) X-Google-Smtp-Source: AGs4zMaH6k5tU679jVkWplCFbdepSTKEU+4IyGwtBmDehi0g6AEwGZo7Wv2ShwJpUKDImgQ+khWw X-Received: by 10.28.206.8 with SMTP id e8mr9299271wmg.80.1511526978822; Fri, 24 Nov 2017 04:36:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511526978; cv=none; d=google.com; s=arc-20160816; b=h+MlbL0LtiLnGdw6GSFlsMab1UhX8mjUeUqc9AI+ugSUR4PsZWcSmffKDu907XkFNj MRTy0S6ldFNq+Hwl3Bjgszq0Kuvwa4E+0z4zD7QBvdsEmbRwi6YSwX7SlH4rX3HBZVkB x8yvX7vjGhwzv7ULNeMOxh7qxIcKwNcMhbuLfFWAc0cSwreBxOj5mCK+YtRgFvm2YBQL ayRjxHw3qTaF4o/iQVZQD9U9rZ1usuKu3r8cpJqlLehLonoSWeQV1NsGDdWdTquqFbJL BKcDwjhhekHMATIS1svG1jxi94DMKf+KowekNRw+J4i4TvWS36yXnJRnblPR8vjxyAsM RKbw== 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:content-language:mime-version:user-agent:date :message-id:from:to:dkim-signature:delivered-to :arc-authentication-results; bh=WwaBIdq54LH+QydGTaR3M04D3felFWw3GZAvhIFt5cE=; b=01HZ+rsmj7f+Q27DLj/NhK2i3efAgXOQh0LYBMS8O6BrgIohTDT5qvsfmg1qyat3Gn tKnGooX7Guj7NA+AyQs2j5bnwEHXowTwQJ11cXMLFKg0L0dWHtl3GSMpCAJi3OHcvefi j6JogtSxTHwlFG0C/o2FZ0TJHMq0waYH2mbqVBHthWmwIFqoiN5Fn2AOtViKGEIJavSE 0ZSoacHtdtjDQa6PrLRHXKtRFPf++KVI8/X1qDpHymyLkm/Rd7z90adceBUSZIboMPRZ k5mGtxcIKExIjGQ92wbN8tSlVGx9VdB37Z+6RI5cMxTKXP6MJ7agy4NRj6vaN1ua2dVi XGVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=SBhYQj/8; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q23si13743986wrc.186.2017.11.24.04.36.18; Fri, 24 Nov 2017 04:36:18 -0800 (PST) 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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=SBhYQj/8; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A12F68A219; Fri, 24 Nov 2017 14:36:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6227D680347 for ; Fri, 24 Nov 2017 14:36:10 +0200 (EET) Received: by mail-wm0-f50.google.com with SMTP id 128so22274255wmo.3 for ; Fri, 24 Nov 2017 04:36:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=u+j5Cw+7GRKEGYsyGw86V4fcdOzTlky4fslEkIlsheo=; b=SBhYQj/8k4H2JfPmwpVoLo1rEybz4Zomw5HQGdFyy81V3OOVJSPSAgkbvRWl6Z9Xht j4fA7L4voPn+o8Q8ElgYNSQUW4w1v/P1ThDX5ETaA6rcGZkZMudFhrpimh0pxbmJruWW 7Q3f1XljFw3fBSNPKOyMhECRnrhL1Qjws+g1k/UVZUHVlbWOZefgg3DHJYBKukXI1IMA FqHqb5yUG2wtQtyOWoa05Xt/I7c2u7fPrrQHjkjthA5cGGI3Xk0PK76cM+Mshg3R2pBX sR9ZiMXyd8/2e5s+4MKQkSFk0W6liIz9NzXJd0qxpDLXm3pUv9vLRmckiDaCm9F2GS9N R8AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=u+j5Cw+7GRKEGYsyGw86V4fcdOzTlky4fslEkIlsheo=; b=hu2OlqKFGF4pcX7ojsePCwMuqwYNfH+ESvoUdrdcDPkh6IgDiEhKcyDL/fdNGUxAPp 1TahmGRdiy/1W5VOXqm1v4qBLbgHk/672Wnt6PlV3DJiiBaT+Ey22AvMMrh3/4aypqoT Tol4Kl6LGTgxoFFgmd8ge5Q9gfqBUBGYpzrD//Y3jdLAxw5UtnCkB7atPRPTz57qEnZ8 o7Zhp9FZ3EswXy6phr5chESwVHWVXLK324vVeoQ0XY6U58gPfMt6H/2FwmCRiv8H9aJH fJEs7yB2JGNpkCnIckpM+3VDs9PMC9YdTdXCgat+BkEv3JLm5JE0SeO8HYz8vc7ClZYt b4hQ== X-Gm-Message-State: AJaThX76eZRoZ/Agrq+epPZXJJpSxhRQ3lodM7pqE/aCEGsRPuYfpixi J0d8KQaHsSs4BXXh6bgY2YJdLkX3 X-Received: by 10.80.225.138 with SMTP id k10mr39065612edl.216.1511526970757; Fri, 24 Nov 2017 04:36:10 -0800 (PST) Received: from [10.0.0.193] ([213.210.30.6]) by smtp.gmail.com with ESMTPSA id a7sm18221404edd.19.2017.11.24.04.36.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Nov 2017 04:36:10 -0800 (PST) To: FFmpeg development discussions and patches From: Mark Thompson Message-ID: Date: Fri, 24 Nov 2017 12:36:09 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] lavu/pixfmt: Remove gap in the middle of enum AVPixelFormat 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This was added for compatibility with libav, by leaving a space for formats added in libav to be merged. Since that feature has been removed, we don't need a gap here. --- Should be applied before the unstable ABI period ends. libavutil/pixfmt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 4c530fe..e184a56 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -230,7 +230,7 @@ enum AVPixelFormat { */ AV_PIX_FMT_CUDA, - AV_PIX_FMT_0RGB=0x123+4,///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined + AV_PIX_FMT_0RGB, ///< packed RGB 8:8:8, 32bpp, XRGBXRGB... X=unused/undefined AV_PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGBXRGBX... X=unused/undefined AV_PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, XBGRXBGR... X=unused/undefined AV_PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGRXBGRX... X=unused/undefined