From patchwork Sun Apr 12 01:54:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 18884 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BD80244B5EA for ; Sun, 12 Apr 2020 05:17:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A404568B663; Sun, 12 Apr 2020 05:17:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EA9268B5D0 for ; Sun, 12 Apr 2020 05:17:11 +0300 (EEST) Received: by mail-oi1-f194.google.com with SMTP id m14so4787230oic.0 for ; Sat, 11 Apr 2020 19:17:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=WldIUTmUc0HQJ1Bbq0ag4ddsvHB7JKjfLqLql5Axqkg=; b=L7X2SJ+LTTez/8WX4CEPUllJBobylTbpK2QGIhG2BCSR2zPzJ4eSJ2rk5FNk4nFZZQ 7tO1Zt5tOaJCYd7rlB2/FfvLw9rYveKaiHQc5orl66RBiTFW67dOw1L/4/JI+E+IKfX0 dOTkQp2/tNUVKe6G1J+OZRyHHje3ISGVHjPZa+YZpIi6O2b1N+ZmoSIrN5wuzdIVu2/q 9fs6eXGq1c/FuGh/zWtq97foLMTBoSjcTLyLFh6ETgHc98fttyLA2bfktqwR7bAYel/R okv+M0O3bnooUuVMAKVP3AGR0gGdnp9bguUIwrwxJRe74UtEl7dwQTLvpq8/SBJrwoUv hzVQ== 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:mime-version :content-transfer-encoding; bh=WldIUTmUc0HQJ1Bbq0ag4ddsvHB7JKjfLqLql5Axqkg=; b=aAx2sZY3K5Rd7nv0NydJJUQI0J/Is0+ORVlbVQ60aU9uKPrYQr4zj8QmTn3gzxtspf vXTK1Rv/jMn1dywudDLEaVM6BFcb2Pz3fOwMNtZUXhqIbinSR3naFOunX/nOxqxXKNvh A6y0WlCJGrMZtkzGA8AjG0uRHNxR28GA5KDUZs8Q9ktd/jsKL4+LKKl7r4uOSVtQQzjg tHoL7Ll23c7POZeln2L+s6MmkvwBOFW/srIA46znjraNS7VhDLKtzt3K+lrarqXJHUCQ ROlCzIAlX299r9id/jLDAu2ot9ud3aXzdoGD8lMDqka1UwOAccZfD5QUmYCsDKkKxGyy fBwQ== X-Gm-Message-State: AGi0Pua2nfqTdozExYy32BypTB8hOejJaVXbnVfqLVnVacUQQVt9rhGG 52yzZyoM/hwIW/5AFcwd5olceCtI X-Google-Smtp-Source: APiQypLnyA3pR9of3fY3WGjXZ6GTCm9VTuS+bSJSBhArQH3+lqmoPNuaJT9WW2nrl4OQX78Uq0QoPw== X-Received: by 2002:a17:90a:23a3:: with SMTP id g32mr1273226pje.78.1586656475436; Sat, 11 Apr 2020 18:54:35 -0700 (PDT) Received: from localhost.localdomain (astound-69-42-19-227.ca.astound.net. [69.42.19.227]) by smtp.gmail.com with ESMTPSA id iq14sm5333257pjb.43.2020.04.11.18.54.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2020 18:54:34 -0700 (PDT) From: Rosen Penev To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Apr 2020 18:54:32 -0700 Message-Id: <20200412015433.249066-1-rosenp@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/mips: fix compilation with MIPS16 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" get_cabac_inline for mips uses inline asm that relies on mips32 instructions. Signed-off-by: Rosen Penev --- libavcodec/mips/cabac.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mips/cabac.h b/libavcodec/mips/cabac.h index 2a05e5ab3c..cc40dbba15 100644 --- a/libavcodec/mips/cabac.h +++ b/libavcodec/mips/cabac.h @@ -28,6 +28,7 @@ #include "libavutil/mips/mmiutils.h" #include "config.h" +#ifndef __mips16 #define get_cabac_inline get_cabac_inline_mips static av_always_inline int get_cabac_inline(CABACContext *c, uint8_t * const state){ @@ -116,4 +117,5 @@ static av_always_inline int get_cabac_inline(CABACContext *c, return bit; } +#endif #endif /* AVCODEC_MIPS_CABAC_H */