From patchwork Wed Sep 11 22:41:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15034 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 6D053449AF5 for ; Thu, 12 Sep 2019 01:42:10 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49FDB687F5C; Thu, 12 Sep 2019 01:42:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30CB268066C for ; Thu, 12 Sep 2019 01:42:04 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id k1so10803884pls.11 for ; Wed, 11 Sep 2019 15:42:04 -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=X1A7AyMIIkwtkW+h4z7hel9LugCt9xVkYyExYvfY3bA=; b=R+0HxNNtlygdA1AatTSqyQ3XVUfn8sNmL45G7PSonX24hjWJlMff63UUemu2SCLZEf FC0aUzyeE+CAUijl44QJEqT3aXiab4x+KlHAWDh476r5PP6QQTCOW717aoThnPDd+EFz 8BNAJ29Mgx6o3QcosZH/r26oTOp1nil0aGSveX7jIaYOA3PqOMpE0QlgUfzB+w7oysGP R9luFWzCkjynx+QZL1bqJ/V1BtAgzCdHBMxSL+qs9tTtgnOEyVj4g+wLIctDJDSjROA0 Jr8u65ikTENEOt5/vvyEB6UTHKwW1cFXcVqKpeoZSYIiHnRUhijmD5EwPHGE4FpYT5Pw VR/g== 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=X1A7AyMIIkwtkW+h4z7hel9LugCt9xVkYyExYvfY3bA=; b=bkK56nZACTa76LWT/GnjfdKuee17kRdRtVfh6AqfG4QzlUGVE8Wiz4v/oNxyBf1usV qGRYiXodwqrwWL9JkJVTW6SoXQjAWQNuDTK24QrlQ7kVrBp4dkB5aBh00zbSzCvjzrn+ BsJHYrwDoNmU+psbVvhJH4mnuZRF6imRZwU0QEYu2i85wUkiVBw6Ka2T8ZFuUOPRX5qN 9yfxujS1sdTCHSKwa/mdH6XFDCwrij58RhVgzP+bRH10gQ6Mq5w73H+rM3vVeS5kj0XM VJ8O/si3ZFy8OuMXsJCIKWPUpx8tSG1i6jP8aA14hT7Ru5p1epihzcPtjNJYqocFec7u B7LQ== X-Gm-Message-State: APjAAAVC6vukuJpE5DysETeusLOO/TWqjTZ5LXRldRLrEsYI552zm/wb RTSSfcL622mazZoTRfvrcZMH7s0N X-Google-Smtp-Source: APXvYqzfWXIRl9Sh50cQhSzSepPEPcHKcwsI2oUagOVVvpb9raSU/aJgfFtsmC5vyAgpiOn3nwwUmg== X-Received: by 2002:a17:902:5a01:: with SMTP id q1mr40476352pli.335.1568241721733; Wed, 11 Sep 2019 15:42:01 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id i1sm28662611pfg.2.2019.09.11.15.42.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Sep 2019 15:42:01 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Sep 2019 06:41:36 +0800 Message-Id: <20190911224136.14655-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190904143835.23657-1-lance.lmwang@gmail.com> References: <20190904143835.23657-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3] avcodec/tscc: fix for the backward compatibility to use const in the z_stream interface 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/tscc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index 6d03081..9eb17e3 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -88,7 +88,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", ret); return AVERROR_UNKNOWN; } - c->zstream.next_in = buf; +#if defined(z_const) + c->zstream.next_in = (z_const uint8_t*) buf; +#else + c->zstream.next_in = (uint8_t*) buf; +#endif c->zstream.avail_in = buf_size; c->zstream.next_out = c->decomp_buf; c->zstream.avail_out = c->decomp_size;