From patchwork Mon Oct 23 17:50:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5661 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp6995495jah; Mon, 23 Oct 2017 10:51:46 -0700 (PDT) X-Received: by 10.28.68.135 with SMTP id r129mr5577567wma.28.1508781106362; Mon, 23 Oct 2017 10:51:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508781106; cv=none; d=google.com; s=arc-20160816; b=Y7qi94WXziJBKKcYodNa7guOpCsvE0KXJBv2Bx7tf3jwdJlWQUFRjIMGHLlIsCaa9Q PLTmQcnU28VPP264auZ6jWE6TAgCY8hpAwPrEX0+rOTilzq0Xfh4M0LnviWwXAmJJinI XpKDCyVVQaIOzehY/QBFo4etQJzChvKYYIy7eeMoCnta5jdoT+6cdM/3iKsBnofqgP4m 3znTXXsUeZo9m6xSA8XFeMoIOghQdHpbYqaJEjNVogDRo7i4ij6nmH3Q7liuj6P5oSRk /tpiZ6FuaQrEBzPD0dJtWI630d+W9Oi0Vmz+bI2lIgfZgnlZFI4AQQUOgOEOrVj47eMC R4/w== 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: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=kPfqsg0gkn4SCl8IJezK5MJVuV/ZrPnY0Q5PTqOf/Z8=; b=nZKoz+a5uSKaEnNXxU2k2CY1v/i3kYhSRFgveGvgSLNJ4i07AS5Zp7CmE/gI9ELav9 0+830DcGxlroDtmLHd1Io0r3W8KeOMZpJ2VmMK9Q9Eq8wOufhxAa4beicdvnFlNNMFLZ ArGyUb0TBGoiCHGyAV7cwz0UgIckBAO+Wq5s1xGWqQ6fFwxIRteU7N7nYu86kkyJJvRY +eMU3rVlZ3m9g/PTX2OW4AtDmyogbLka/PyichKxWhQwy+qEL31/78C7PPMWmW9HfbI3 hN0CGmyHFsiM5EzhXUC6dgIcRmpXTtqQHgqI7HSYlBhgLVKd/A1xtVimUQH8fYiOqIDr jfmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=e+jAl404; 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=NONE 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 a95si1412391wrc.299.2017.10.23.10.51.45; Mon, 23 Oct 2017 10:51:46 -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=e+jAl404; 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=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 8367968A145; Mon, 23 Oct 2017 20:51:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60C61689DE0 for ; Mon, 23 Oct 2017 20:51:30 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id 17so22995463qkq.8 for ; Mon, 23 Oct 2017 10:51:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=DJfkuFVk/XTNYIshQK/ZzKlfdGmgeez0DeC6NXOMOoE=; b=e+jAl404D94CFsPa7TXLOpENPk1cFE8TPO85Q3+6xR2e5qMdMwWDUVhUq2vA4amzIh 0Y+fDWx7GwwXEXRlG1WcHTr3fgJbtpUBvT+eYKJ9J7FnaE3Mc09Mz07rgs7AlASDwxRL rJ3+nXRWieWo2f1J5DYSClbAzz8JCzBy1eAQxM3erlfdv3B6a/NuIMPLgMIu4fV2MxuG tPCWDTPNLXCv0pYQ5H+kmvP+mNrP5MWk9ea4MKNzWpAbxBesTzG+gVBBXcwF4lTPESKl 7jG7LADyp+A3tUFYhGDUeWcZXyaL6UjrI4tk2G1JJFNifT1r7rOGvxgEUub68cje+vPd oPWg== 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; bh=DJfkuFVk/XTNYIshQK/ZzKlfdGmgeez0DeC6NXOMOoE=; b=sfiKnJicyB0Yw/O90vwHSXo03AN8HbufRc91jmxnDY+3b0+5Rgg4Xyi8KaHsIlxHNO 0wEYcrI+dMs3mA1Sx/fHMrZMBFyB1VTqDpgZ+HY5aacZmG4z0tyQ9AYIAxSHOFeduoIx tUJ2oFvXCbKKJwGiE6MG3Uw4zcFkmE4GQ3IXYv9O493D7jDAOJOHJCyKR8/pPvb+MMYw LuUEbmR2UEb2/ZchxSDh/ln6snV/cn2nwgDxkWUtOTyeLwjQrTxh1oxkzJGNAq1SGYV9 tRZlg+hUGrzhqh50bl72GlnJD/CPV9NCt/qm8ZcyVUuxemc+9E2y8cwDOkGUTtd/YJxo oZ+A== X-Gm-Message-State: AMCzsaUcn3ITHARFmdRT435R0elMDjHLgKPTaZ5GOuE+1pxQnrsbNxy/ UJ2oWcj1uhkVGCvhpBo7cdRNTw== X-Google-Smtp-Source: ABhQp+SlzmMi2HFY8igCSKSpWT8mftrIQ0FxV1D91RJmKOerszXrrcTWGxm0OvP1cZ+4q/SJVc6cmA== X-Received: by 10.55.99.69 with SMTP id x66mr19969075qkb.87.1508781096228; Mon, 23 Oct 2017 10:51:36 -0700 (PDT) Received: from localhost.localdomain ([181.231.59.220]) by smtp.gmail.com with ESMTPSA id t126sm4973549qke.36.2017.10.23.10.51.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Oct 2017 10:51:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Oct 2017 14:50:43 -0300 Message-Id: <20171023175043.3152-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] avcodec/libx264: add me_method alias to set X264Context->motion_est 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Replaces the now dropped global option. Addresses ticket #6771. Signed-off-by: James Almer --- libavcodec/libx264.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index b11ede6198..b5e04d674d 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -958,6 +958,7 @@ static const AVOption options[] = { { "vbr", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_VBR}, INT_MIN, INT_MAX, VE, "nal-hrd" }, { "cbr", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_CBR}, INT_MIN, INT_MAX, VE, "nal-hrd" }, { "avcintra-class","AVC-Intra class 50/100/200", OFFSET(avcintra_class),AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 200 , VE}, + { "me_method", "Set motion estimation method", OFFSET(motion_est), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, X264_ME_TESA, VE, "motion-est"}, { "motion-est", "Set motion estimation method", OFFSET(motion_est), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, X264_ME_TESA, VE, "motion-est"}, { "dia", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = X264_ME_DIA }, INT_MIN, INT_MAX, VE, "motion-est" }, { "hex", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = X264_ME_HEX }, INT_MIN, INT_MAX, VE, "motion-est" },