From patchwork Wed Dec 7 21:05:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 1710 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp519938vsa; Wed, 7 Dec 2016 13:08:26 -0800 (PST) X-Received: by 10.28.150.75 with SMTP id y72mr4680675wmd.47.1481144906305; Wed, 07 Dec 2016 13:08:26 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d79si10035882wmi.16.2016.12.07.13.08.25; Wed, 07 Dec 2016 13:08:26 -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=@ob-encoder-com.20150623.gappssmtp.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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC7A468A084; Wed, 7 Dec 2016 23:08:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wj0-f172.google.com (mail-wj0-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5F4B689D99 for ; Wed, 7 Dec 2016 23:08:14 +0200 (EET) Received: by mail-wj0-f172.google.com with SMTP id xy5so372362085wjc.0 for ; Wed, 07 Dec 2016 13:08:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id; bh=EUUbO3J8CZoD/zg5ica3rbisChMgl4S3CWE5ed6eovY=; b=OSWGJO/wEIeRp63ZUhUvWYG2tsDW647dt4qQxOI+ILSGDlQKlq1btK/HV9ruU0SJcW UvWbXBA4vymsTpxyv5cz849k3kcSWq/833j78mWbkxIhx8oh8uEw9/N2RA1EcWYTB/NI HhleC3jiCPCmtUN/mauAVFL9IhlxKblFYbilCT4Jd4pBSZPPYZxFU90YL84s8QDxlFXv jeowPollwIGFliUlX4J6IJDVYEQ5J6eCaT/ticWWnZyw/PIB/D1SH2wEICg0ApHpN0lh bz3Tzb7Pf84wSxn5SPOU/pqbU29askihA7bQVtFlCRLdikqRVExTIUkjAw78HpjT0jx8 O7fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id; bh=EUUbO3J8CZoD/zg5ica3rbisChMgl4S3CWE5ed6eovY=; b=brnRP25H0Mibt7OMpYlGcetSGswCIKN27Kr48PP97Fh/sPbzP96vQWFpJmg4Mvhrzv 9rw6ZoiJ7x6SLu66p8/ztIcWkCR8HEDkKVg5CkeFsjqPZDZGYeo8A2q15lQfIoatY/Bi PGwnS4GlqPYOnA4cKZwGET2fVl7FzwnXxi8AhOxRFT6Snnwh+tScWmgIyH58G0oIct/b BxPHX23jb3o2XCVJh9fdgPEwvKBDfqK9XkDqqTNycbfRZhqjd5kYIBPMmx0fH34Pm+6Y bkEKUE0JlKjN5/8RXWJ1GT9S1/Pf4JtvkKUv/+lrxhBkh+rFfT5wYFMCXR7mFvkWAaBB YWfQ== X-Gm-Message-State: AKaTC01e/YOsABDZwFZsT0DVIoZY8qriN7uBDp2Eri495kkUVGvmviHdLotVjbcskGFB9g== X-Received: by 10.194.248.5 with SMTP id yi5mr61276374wjc.11.1481144897106; Wed, 07 Dec 2016 13:08:17 -0800 (PST) Received: from Ifrit.systemlords.lan (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id e6sm33312752wjw.33.2016.12.07.13.08.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Dec 2016 13:08:16 -0800 (PST) From: James Darnley To: FFmpeg development discussions and patches Date: Wed, 7 Dec 2016 22:05:39 +0100 Message-Id: <20161207210539.20763-1-jdarnley@obe.tv> X-Mailer: git-send-email 2.10.2 Subject: [FFmpeg-devel] [PATCH] avcodec/h264: resolve assert being triggered when stack is not aligned 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" 32-bit msvc. --- libavcodec/x86/h264_deblock_10bit.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/x86/h264_deblock_10bit.asm b/libavcodec/x86/h264_deblock_10bit.asm index 56cf4d6..c295364 100644 --- a/libavcodec/x86/h264_deblock_10bit.asm +++ b/libavcodec/x86/h264_deblock_10bit.asm @@ -1001,7 +1001,7 @@ cglobal deblock_v_chroma_intra_10, 4,6-(mmsize/16),8*(mmsize/16) ; void ff_deblock_h_chroma_10(uint16_t *pix, int stride, int alpha, int beta, ; int8_t *tc0) ;----------------------------------------------------------------------------- -cglobal deblock_h_chroma_10, 5, 7, 8, 2*mmsize, pix_, stride_, alpha_, beta_, tc0_ +cglobal deblock_h_chroma_10, 5, 7, 8, 0-2*mmsize, pix_, stride_, alpha_, beta_, tc0_ shl alpha_d, 2 shl beta_d, 2 mov r5, pix_q @@ -1036,7 +1036,7 @@ RET ; void ff_deblock_h_chroma422_10(uint16_t *pix, int stride, int alpha, int beta, ; int8_t *tc0) ;----------------------------------------------------------------------------- -cglobal deblock_h_chroma422_10, 5, 7, 8, 3*mmsize, pix_, stride_, alpha_, beta_, tc0_ +cglobal deblock_h_chroma422_10, 5, 7, 8, 0-3*mmsize, pix_, stride_, alpha_, beta_, tc0_ shl alpha_d, 2 shl beta_d, 2