From patchwork Thu Oct 6 12:31:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 896 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp849065vsd; Thu, 6 Oct 2016 05:32:21 -0700 (PDT) X-Received: by 10.28.39.134 with SMTP id n128mr25634914wmn.60.1475757140982; Thu, 06 Oct 2016 05:32:20 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m125si37274741wme.54.2016.10.06.05.32.16; Thu, 06 Oct 2016 05:32:20 -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; 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 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 3FD61689E52; Thu, 6 Oct 2016 15:31:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C7066808B8 for ; Thu, 6 Oct 2016 15:31:52 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id f193so3309689wmg.2 for ; Thu, 06 Oct 2016 05:32:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7QvKt71AYTPCcVPwYlztElF2fz0LS6/kFQcA7ThxtQY=; b=p4LtKZDQCD+hPt+HnydQV9UB0w4rDmAwpje/roHKDQnb0DAeIngCt6xyQMQ6xaJcrl GsOas3UegEBqJ2L2y99edXniLQ+di4LtQROgWIdFTOj9j7Fw6GlkEnhlKr19y+JB5Gg2 eMF0YhwuxzFjmIJ/v+K/Qs5hzSgcHuBooUYpEgwth4pyHhu+CBaloEWG93WIGlPe1klc QDgZp9+pIel0BXP+PdRFvEcaaCuUNKdGOWocwj15ZTjLpiGJEbEznxDXYTZCMwz1yU4I 6xRzUq4b4KaQdb4furOmAocGzMxRA7UHrw5RML3SD+lTNaRRVKeEaqE+dPC3Rz8WRXjZ TQDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7QvKt71AYTPCcVPwYlztElF2fz0LS6/kFQcA7ThxtQY=; b=BlGPfOjFCRRk9HkvQDAMoNYu9mFwU7NXzvEl6ifzmmj2LLQbFfZFIDdcTERTQEDhLJ tyzxlodka8oqpLGo9ocd1cNV7D4rWJyg3m5jh83vutvvwM7le0hVPpPXYjQPaJm0VFgt INAC2WyMh/q3ismBNIrL4hVuOwrb3uvJZ03bTD6euHrM6dB5hJw/GL1/5XfkCK28ig5d AN4pl0qf2gGeTjrADWSNW+uJkz65AbRNpNTvfO6Vej26jWmDyZzRB6eq080r9GaSe87w 8R1WbYJijX0o9ioTZy0DzlmQxdF+4EirjPYGHSH3Rwbuyqya+0CX2OaYKA6upIhXCx1e cr+Q== X-Gm-Message-State: AA6/9RnZgbosP/s9Y3U1IS9VHAZcj9hNmUAgFgm4D+gCef0mB8sT1LDGHvszEbUSJvSL7A== X-Received: by 10.194.235.103 with SMTP id ul7mr13918481wjc.201.1475757126850; Thu, 06 Oct 2016 05:32:06 -0700 (PDT) Received: from boken.gopro.lcl (LPuteaux-656-1-74-135.w80-12.abo.wanadoo.fr. [80.12.80.135]) by smtp.gmail.com with ESMTPSA id va3sm14322593wjb.18.2016.10.06.05.32.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Oct 2016 05:32:05 -0700 (PDT) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Oct 2016 14:31:57 +0200 Message-Id: <20161006123157.8434-3-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161006123157.8434-1-matthieu.bouron@gmail.com> References: <20161006123157.8434-1-matthieu.bouron@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] lavc/mediacodecdec: fix size variable shadowing in ff_mediacodec_dec_decode 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: Matthieu Bouron MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Matthieu Bouron Fixes incompatible pointer type warning on 64-bit systems. --- libavcodec/mediacodecdec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index 3d519ca..126de17 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -561,7 +561,6 @@ int ff_mediacodec_dec_decode(AVCodecContext *avctx, MediaCodecDecContext *s, } while (offset < pkt->size || (need_draining && !s->draining)) { - int size; index = ff_AMediaCodec_dequeueInputBuffer(codec, input_dequeue_timeout_us); if (ff_AMediaCodec_infoTryAgainLater(codec, index)) {