From patchwork Thu Jun 15 19:50:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ronald S. Bultje" X-Patchwork-Id: 3993 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp955780vsw; Thu, 15 Jun 2017 12:50:54 -0700 (PDT) X-Received: by 10.28.72.7 with SMTP id v7mr4843502wma.125.1497556254648; Thu, 15 Jun 2017 12:50:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497556254; cv=none; d=google.com; s=arc-20160816; b=BNHgBKJ3ThORA0ssQuObxgpjUZygPU1STS7btPrJvKKachm15xlGaLTrmNApsfNpUM NIzDCslgfCpXVRq2bhg+rOBlKgemBdrm2+LXHrpNXogrEema+VJ8sOMBByssl4RZfRoe Mt7hW7w1vNM1JO+KFwf1QUewrITq8jnasPD8cYAKkXXPBy86Ww0ZRhDq3PnL6Rf3igK1 c87cSwS56QRNMUPiOh7cMdwxnTjnLC84wVuIwq2fluIqa9Db2pRpYPcMH026PWOhpRNG asuabb3gsyh92Zw7Ik8l2frwRsOwQ9q8xER3bEmb8Hfh0c1AmG7D0lzL+UAOWVB6s/0r 5dEQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=N/iuRjIeyKjDzjkr4JPv2kyOTM1eqW+P8AwkRRdNkLI=; b=AZ/ScBTEj6Zzrn8Odlt4j2pgwKW7zPRRCyjCLwEXk/241elo/q7p+ZDebRpYifFefv ODW30cmL2u8PjC+n4nXPTaWo5b8fw6LMo8I5XZPiRbr4WsbEdk824KbozR9qqiSqZBTG IciGOXaZX7YqK70pROy6Q8+ywYbGtNRfSpnwyBluPRrARnvQMw5cVlY3SFAcAtRMLVYT VLJLgWqoNVwVM6QSrTA5PUDE664lGHQoDukyfrX0P2OzdPmYCFCkXGEkPu29X4iDo686 hurgAE35BAHwgbX+QTiRccwj2FyZCcebBxTrX5j2YAMaEooAHrUwdvZXfhfGuPx8q698 X8cQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=ClYg2AzW; 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 a19si923150wmd.95.2017.06.15.12.50.54; Thu, 15 Jun 2017 12:50:54 -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.b=ClYg2AzW; 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 E669168A3B7; Thu, 15 Jun 2017 22:50:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9269168A34C for ; Thu, 15 Jun 2017 22:50:36 +0300 (EEST) Received: by mail-qt0-f195.google.com with SMTP id x58so5391865qtc.2 for ; Thu, 15 Jun 2017 12:50:39 -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:in-reply-to:references; bh=32xsTFzTBA54W+TQ+X1awSv3zb26OFgZfkhGjtGWPjI=; b=ClYg2AzWH6EFuYet0gmv9D2JRNLVpPAPcGn9JsHuWKkxPYtWtbgXPkdHc4OgsdmiVA QuLmLDjYjlwDIl4/9sNI3Pm0PkzaAeU9YKB5NYxal9WY5VneXY6oHS1B0MSuGGzWFcJc Iqu0sGgqjn9ckJslKNmZJz+aNfvIhjSwkEXy8msq6UhLIljh93VY6IxZvzzO9u3Ktv15 L8yiWrjDohPCxx5wTECtvKOr21QfqLKG5vIsZ9IUGWBIOdb0XdejAKkmOEvtaWJIQsF+ A4NhDkB+/hGS6TQxIauvUz4ciUFakXvpRidG8JGVO98FKT3JoJnaP7z7RUrXJueFV/92 DIlg== 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:in-reply-to :references; bh=32xsTFzTBA54W+TQ+X1awSv3zb26OFgZfkhGjtGWPjI=; b=DJcycR295ktKmThgNNFDoHfOC8G18HL3iPraF/7HePkwo9FRPMUyOPwq2gLXhQ/zKP 2cZgdtiKRcP1wSTcDV6lFD4e2k02N8zAfaRRKQ5jfHcEVopy2PGvyhbr/NCMTA+nWd5x N3Tab9QTArwz4B3/sIMgb2QMPirQBnsdruGeX3SMWAjNOaHIhRJ/mcl2a/dwCuw7Z5Ue rMTa1RSSg1vtUwuAG1gFB9RjVz8sDSn52k3ZR5The9zuliuLvsgOX3SrmNEjtC12NFXG 2WGoG6qfyEFisqGKJ8Avj2XuCj+VQ6Kg5DgXwkJgnAoRJvD6w4ZdesbfdsUvg4sH/lZ0 rEow== X-Gm-Message-State: AKS2vOyeEfjEJxLvpIYo9ytk//EVORnFMCKRWPhOp+IceRDuMDoHrG+W XqC+c5OZYHmgzL3S4e8= X-Received: by 10.237.38.133 with SMTP id q5mr8299188qtd.152.1497556238697; Thu, 15 Jun 2017 12:50:38 -0700 (PDT) Received: from localhost.localdomain ([65.206.95.146]) by smtp.gmail.com with ESMTPSA id m29sm94796qta.66.2017.06.15.12.50.38 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 15 Jun 2017 12:50:38 -0700 (PDT) From: "Ronald S. Bultje" To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2017 15:50:32 -0400 Message-Id: <1497556233-65009-2-git-send-email-rsbultje@gmail.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1497556233-65009-1-git-send-email-rsbultje@gmail.com> References: <1497556233-65009-1-git-send-email-rsbultje@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/h264_mb: Fix 8x8dct in lossless for new versions of x264 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: "Ronald S . Bultje" , Anton Mitrofanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Anton Mitrofanov Signed-off-by: Ronald S. Bultje --- libavcodec/h264_mb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index 638dcba..cb9fe85 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -637,7 +637,7 @@ static av_always_inline void hl_decode_mb_predict_luma(const H264Context *h, uint8_t *const ptr = dest_y + block_offset[i]; const int dir = sl->intra4x4_pred_mode_cache[scan8[i]]; if (transform_bypass && h->ps.sps->profile_idc == 244 && dir <= 1) { - if (h->sei.unregistered.x264_build != -1) { + if (h->sei.unregistered.x264_build < 151U) { h->hpc.pred8x8l_add[dir](ptr, sl->mb + (i * 16 + p * 256 << pixel_shift), linesize); } else h->hpc.pred8x8l_filter_add[dir](ptr, sl->mb + (i * 16 + p * 256 << pixel_shift),