From patchwork Tue Feb 13 03:12:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 7578 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp563135jai; Mon, 12 Feb 2018 19:18:43 -0800 (PST) X-Google-Smtp-Source: AH8x226YoXalmaHZQs5Nf0osVJxV4Pr2FH/OwwQ7XzwHXYAToRklraafvg5nqsCdY/iMxN5dk+Xc X-Received: by 10.223.152.193 with SMTP id w59mr10405939wrb.74.1518491923370; Mon, 12 Feb 2018 19:18:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518491923; cv=none; d=google.com; s=arc-20160816; b=dTjSiuwyev612huUEEwJRBK+SacwMvv9WKe1Y1qUDTc/TvA/exCUvbXIzKVLL5xePL XEiPtePbOo4xbwXrEqTrIJlcokgXERhlzyK+0YbnLknhgct68qR/qsSEZkz9JHYV18p7 6rLOqOIPRd2BvAI8Mm1/Jy4Orh1FnieKrBBFDAH8pS0vFd7xWUcfHZoKKktK22UGNmMc P/VS9MiBb5ExJgvo0Tgsk9gZY8LUvyoNZN9woRQir/AJ0lMajfU8jTSE4MsYRAXfwbUm JnpA94P9G6A8V1hxo1tt1VXkB/zNVENZAigdsFyFS2zAbELnEnbLT15yHjTahB/rXQsS sx3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=rty40R9VOAPB1vgqIkO3NjQMB3uVHaM6QqLAx1H0QKY=; b=FQklbg6P+u7nP1jX61Kv6jDg+d439zahe5KdCDrDvnrRKPG2b2icMhtT215dM8KmUy vdoTrYYGnz25uO0/h1PZkS4UMlbtGicVbHHv5t9tYWasCu9dEeUVqGGtNPKkfpZx03Xq 1Gr406qFBKhoGP0ut5JbPuUZvtcBNAWOBz9IgOf4XDvOVg2wt22oyAMMmYftiGzsUjhs mwBYchYe+9BSGtZ8VHqRc7JnSp6lVYDjAZhFlU8QY5yVcmjFd9dUEjUZbBhhQgmakqOu bJLXdKAIZyMq3GaxOgGg2p7SZBSLeRSdXuV7p/T+2IkBJZQUkipteAT6GZLWIIivR22o +/Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=DpivExGR; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c21si1711281wra.257.2018.02.12.19.18.41; Mon, 12 Feb 2018 19:18:43 -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=@googlemail.com header.s=20161025 header.b=DpivExGR; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 21BBF689A8B; Tue, 13 Feb 2018 05:18:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 423E3688330 for ; Tue, 13 Feb 2018 05:18:22 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id v123so13467567wmd.5 for ; Mon, 12 Feb 2018 19:18:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=N0etv8Rfm0L9svheS6lfWKGO5evh6KmJLfQUScXsGhk=; b=DpivExGRHoQN/6dN/hERLimakxWCNMXc4HzCm6K6tays3DNELkmjzpABKZN+sBLWOH t3G6IxmQKC7s9zarN476YOlFNPe25KYMBWdkG6JnvUxP/Ox+xEOIuzIXcYSBEQEu1JHl iK2a5WKyX3JhhKHgfg5cXCspzCjkcA4k4eIzIO3OobUuL2Y/od8jppk70+g7pR+BJJe7 ELqBISqnQvcu30S1aTv+l+zVG0rtMUK25ceg59CtNe1wpUzqEAouaq8eBnKfeFK8rL9z vJG70q/ugSPcAjbJCIYIWBe4StBhTOCIov++rqNIKdGOm4MS19mJJ6V0WzY+D31t4p9V tYiQ== 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; bh=N0etv8Rfm0L9svheS6lfWKGO5evh6KmJLfQUScXsGhk=; b=fdXUQrklP0I/rigSsjQJ2l+9a22o7DXFN5UW9ztbUM2bKDOLUAI5fcMaccfQJuFYQF tRdfds00+oRLRFbsOldIWUeh3uQxCz1J0sVm5rKwZEtfTE3TdpTC8DoIYJMcV+Ig3Ci/ QExFSCgRXfhEzUS3tVUipJGakvzzXMl8I8q20GkO89aPYM2taZ0VkL+jQdCwjaDV3Nsx tPMneZDNo8xWPs4lzFhakiyrl4WPohAy9Z5/46mzkEFFM2ojnzLWi8FxC1alElKFLR7B iy4uMWzTTvlDgJcELklXlOPlw/IZtuZNYRMYnUyammZl6BBIo4TipDf4k678NsVtOCC3 YqoA== X-Gm-Message-State: APf1xPB7Epd4RUkQhXmuXiK8FR3p0r6Ni1PjDQ3Z4H5WhUo91nm7zpep rKFZY90tA7fL3s6rUt/atnYiqw== X-Received: by 10.28.218.197 with SMTP id r188mr75350wmg.42.1518491543234; Mon, 12 Feb 2018 19:12:23 -0800 (PST) Received: from debian.speedport.ip (p2003006CCD4EDC803DC4C92685D2208F.dip0.t-ipconnect.de. [2003:6c:cd4e:dc80:3dc4:c926:85d2:208f]) by smtp.googlemail.com with ESMTPSA id d5sm10669367wra.72.2018.02.12.19.12.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2018 19:12:22 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Feb 2018 04:12:21 +0100 Message-Id: <20180213031221.15691-1-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.16.1 Subject: [FFmpeg-devel] [PATCH] avutil/opt: remove ABI hacks 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: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" These were needed for ABI compatibility with Libav. We don't need them anymore. --- I'm assuming we're still sort of in the ABI unstable phase. --- libavutil/opt.h | 18 +++++++++--------- libavutil/version.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavutil/opt.h b/libavutil/opt.h index 555929dd6b..391720f2e2 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -229,15 +229,15 @@ enum AVOptionType{ AV_OPT_TYPE_BINARY, ///< offset must point to a pointer immediately followed by an int for the length AV_OPT_TYPE_DICT, AV_OPT_TYPE_UINT64, - AV_OPT_TYPE_CONST = 128, - AV_OPT_TYPE_IMAGE_SIZE = MKBETAG('S','I','Z','E'), ///< offset must point to two consecutive integers - AV_OPT_TYPE_PIXEL_FMT = MKBETAG('P','F','M','T'), - AV_OPT_TYPE_SAMPLE_FMT = MKBETAG('S','F','M','T'), - AV_OPT_TYPE_VIDEO_RATE = MKBETAG('V','R','A','T'), ///< offset must point to AVRational - AV_OPT_TYPE_DURATION = MKBETAG('D','U','R',' '), - AV_OPT_TYPE_COLOR = MKBETAG('C','O','L','R'), - AV_OPT_TYPE_CHANNEL_LAYOUT = MKBETAG('C','H','L','A'), - AV_OPT_TYPE_BOOL = MKBETAG('B','O','O','L'), + AV_OPT_TYPE_CONST, + AV_OPT_TYPE_IMAGE_SIZE, ///< offset must point to two consecutive integers + AV_OPT_TYPE_PIXEL_FMT, + AV_OPT_TYPE_SAMPLE_FMT, + AV_OPT_TYPE_VIDEO_RATE, ///< offset must point to AVRational + AV_OPT_TYPE_DURATION, + AV_OPT_TYPE_COLOR, + AV_OPT_TYPE_CHANNEL_LAYOUT, + AV_OPT_TYPE_BOOL, }; /** diff --git a/libavutil/version.h b/libavutil/version.h index d81ec6fa7b..a2a820aebf 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -80,7 +80,7 @@ #define LIBAVUTIL_VERSION_MAJOR 56 #define LIBAVUTIL_VERSION_MINOR 7 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \