From patchwork Tue Sep 15 07:39:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22412 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 2A6E244A52F for ; Tue, 15 Sep 2020 10:46:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0332668BCAA; Tue, 15 Sep 2020 10:46:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE26368BC4C for ; Tue, 15 Sep 2020 10:46:48 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id z9so2395926wmk.1 for ; Tue, 15 Sep 2020 00:46:48 -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 :mime-version:content-transfer-encoding; bh=EHOMylRkF9hyMnJU5jLJfxXkoflHZ7zEyI6CI9a2TPE=; b=n86N51SDwvFGfXDFZNz2wgvn8sWkjMUiZx2BysGg5T9IASauou63t4VplfLXltS3zm pTqAuuXODZTUvqaqqLqr+z0tfKlnk8g+IndLYKf5paZAkNGW2MgwYa84s72C9ACeKYvA TafqlBga7d0EGbxMEg39WP+A8v9ytFyBLpd77irEc6yjryT3DhgQ3ubBt3RIW7pexgcf nIouZz9yCUSAtYGCOObXDXwrUC2itB3yz6f+fvZdhYZPi1SqxcbV0CQ5uBWiXxVD2Axj 27lqU3655C68KxraJvOun+XQXsasFvjXA/jbghT9mCeYAb91RwinlzY8P2f1oT/p8MHO w5iQ== 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:mime-version:content-transfer-encoding; bh=EHOMylRkF9hyMnJU5jLJfxXkoflHZ7zEyI6CI9a2TPE=; b=jdlV+MyAahFEZghHxVXMTio62g87uAxMyi6v58b4yegAspFDnUoEA1urEvb5Lyfgc+ 3xDw1vgCuuCjkEK/YLfbGNqXGyuv+4l4W9z8frc0pogH3SLFXPFlkfuuEx1iK2wvHBmB z+lAckyj0ehS9j31b4ZP8II6PbDp6ToK9RcdhmSjeWaLuU9kMXwTmQb+NR5WB313btSx Yx8hG6Qe55qpwjD0cq13TEwjQVSGSAmZxFzuebxsuQ94pgO8Lt2yZKy6FKGvXxIN8QlY El5btOVdPLM3NCxCC8GnOFFeTHskPGCN5SgwsTX/QRLP2R5x3tXjZVvxWxgvz7odSxeK wksQ== X-Gm-Message-State: AOAM533mBW4cdsA13g8ufQQl6I1BJ76Pzdx+dIuPRDvK2cRue4MR7Fmt MinPm7pxqyg7xDEWw6JyPQdeYjP71DU= X-Google-Smtp-Source: ABdhPJxqmNm5icQLdaVQFTVRQOG9jCLuJZCanuID7u3yEr6Kv0y6iS/JgzG/RSiCZpbm7Kvf8YXEVA== X-Received: by 2002:a1c:7502:: with SMTP id o2mr3149051wmc.29.1600155627971; Tue, 15 Sep 2020 00:40:27 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id d23sm6112125wmb.6.2020.09.15.00.40.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 00:40:27 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Sep 2020 09:39:32 +0200 Message-Id: <20200915074000.102622-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> References: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/30] avcodec/flashsvenc: Remove unused z_stream 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This encoder uses the compress2 utility function provided by zlib instead of using a z_stream. Signed-off-by: Andreas Rheinhardt --- libavcodec/flashsvenc.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index 4ac643c036..95ae988448 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -61,7 +61,6 @@ typedef struct FlashSVContext { int block_width, block_height; uint8_t *encbuffer; int block_size; - z_stream zstream; int last_key_frame; uint8_t tmpblock[3 * 256 * 256]; } FlashSVContext; @@ -92,8 +91,6 @@ static av_cold int flashsv_encode_end(AVCodecContext *avctx) { FlashSVContext *s = avctx->priv_data; - deflateEnd(&s->zstream); - av_freep(&s->encbuffer); av_freep(&s->previous_frame); @@ -112,9 +109,6 @@ static av_cold int flashsv_encode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } - // Needed if zlib unused or init aborted before deflateInit - memset(&s->zstream, 0, sizeof(z_stream)); - s->last_key_frame = 0; s->image_width = avctx->width; @@ -180,7 +174,6 @@ static int encode_bitstream(FlashSVContext *s, const AVFrame *p, uint8_t *buf, ret = compress2(ptr + 2, &zsize, s->tmpblock, 3 * cur_blk_width * cur_blk_height, 9); - //ret = deflateReset(&s->zstream); if (ret != Z_OK) av_log(s->avctx, AV_LOG_ERROR, "error while compressing block %dx%d\n", i, j);