From patchwork Mon Oct 7 00:57:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15537 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 816D944939F for ; Mon, 7 Oct 2019 03:58:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 55FCD680A86; Mon, 7 Oct 2019 03:58:40 +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 9C4CA6805D8 for ; Mon, 7 Oct 2019 03:58:33 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id p7so10710417wmp.4 for ; Sun, 06 Oct 2019 17:58:33 -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:mime-version :content-transfer-encoding; bh=zqNNAgXHI/gHsbfM4Ob1y7/+NGywPKgH3qgGHv/qzAs=; b=XGE4n++x3ik2K7lXLTwDqmoO5cl/Puu1hCerGjw5+vmmVAUddPmAu7A+Qc8nrK8mm/ ovLLPR9yy1d+EkxeZdTKb0vp8hsgPXeTw3DCstSzgUnh/cal/QwY/3XKUj5J8dI3iX5l VGQxZ1OQEuq36eR63nuK0WU6Eh+zvlVeRGHHK/fGshYTgEpSfbr1a6driLR6EdWaTyCt sLNA33YCwKdPZA/+2vsgbVScMDz3mQ4W3O7TVyBhqBVdrrzNo8kWwRnKL/fB3QJLxTN2 PIxzrE0YLwrH/vIRmWEeVpRVIABmnpc+NlqtrOVNeJe4TI7R9Uy3nQSEqZ8zg/8u7tMJ 5Wew== 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:mime-version :content-transfer-encoding; bh=zqNNAgXHI/gHsbfM4Ob1y7/+NGywPKgH3qgGHv/qzAs=; b=mc3yGhwR5FjR6M87tOUa3iX1GyRSTfPeQgSQXpxkleeu4C4mo/IjkVxX4grAC0x0hY arZFVx/f7dFM7QURsQCGxv4aMt/2oX1H7wgQiUzdROepHkFjitP+DRnKjAmJjTy9wVft gzvrJPSHslOoY1UeAb110a2G8nheHwtfypMAPkko6VBo2RnOT4vFd17UbE5GarRdGRT3 KbWLhT8jk964GlBokbUxHuO2AWWg7pr5Y4WzJ6Aj9TmpJvieABrASaq9WirqJmfo3PCy KOAkw9+H+8EDvRjTO68ZYO7Su0Enw6kGFnvvAYGi67SdWLzqmN6RqOLLuD6/7cIe6iBg svGw== X-Gm-Message-State: APjAAAVzOBs9Km3Fgz2svrqtNSrMgFLZcQPdJKBEapI5le8HCCaVbQMs xKtYdcMqx2+25ar6PYxJI43UqcNo X-Google-Smtp-Source: APXvYqwDj6xf264W88YrudeUCfZvcUzAVolGKWsaxHV2jUeqUMAAvccXSi8SCuIh4vhnyfdwymfEoA== X-Received: by 2002:a7b:c451:: with SMTP id l17mr16788510wmi.61.1570409912685; Sun, 06 Oct 2019 17:58:32 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id g1sm13208954wrv.68.2019.10.06.17.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Oct 2019 17:58:32 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2019 02:57:25 +0200 Message-Id: <20191007005725.13605-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/zmbv: Simplify assigning decode_intra function pointer 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" zmbv has only one function for decoding intra frames, namely decode_intra. This can be used to simplify the process of choosing the right function pointer. This also removes spec-incompliant conversions between function pointers and pointers of type void * and thereby fixes the warning "ISO C forbids assignment between function pointer and ‘void *’" that GCC emits with the -pedantic option. Signed-off-by: Andreas Rheinhardt --- libavcodec/zmbv.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 99e735cfd9..8e9e13c936 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -425,7 +425,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac c->flags = buf[0]; buf++; len--; if (c->flags & ZMBV_KEYFRAME) { - void *decode_intra = NULL; c->decode_intra= NULL; if (len < 6) @@ -436,7 +435,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac c->fmt = buf[3]; c->bw = buf[4]; c->bh = buf[5]; - c->decode_intra = NULL; c->decode_xor = NULL; buf += 6; @@ -460,7 +458,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac switch (c->fmt) { case ZMBV_FMT_8BPP: c->bpp = 8; - decode_intra = zmbv_decode_intra; c->decode_xor = zmbv_decode_xor_8; avctx->pix_fmt = AV_PIX_FMT_PAL8; c->stride = c->width; @@ -468,7 +465,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac case ZMBV_FMT_15BPP: case ZMBV_FMT_16BPP: c->bpp = 16; - decode_intra = zmbv_decode_intra; c->decode_xor = zmbv_decode_xor_16; if (c->fmt == ZMBV_FMT_15BPP) avctx->pix_fmt = AV_PIX_FMT_RGB555LE; @@ -479,7 +475,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac #ifdef ZMBV_ENABLE_24BPP case ZMBV_FMT_24BPP: c->bpp = 24; - decode_intra = zmbv_decode_intra; c->decode_xor = zmbv_decode_xor_24; avctx->pix_fmt = AV_PIX_FMT_BGR24; c->stride = c->width * 3; @@ -487,7 +482,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac #endif //ZMBV_ENABLE_24BPP case ZMBV_FMT_32BPP: c->bpp = 32; - decode_intra = zmbv_decode_intra; c->decode_xor = zmbv_decode_xor_32; avctx->pix_fmt = AV_PIX_FMT_BGR0; c->stride = c->width * 4; @@ -517,7 +511,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac } memset(c->cur, 0, avctx->width * avctx->height * (c->bpp / 8)); memset(c->prev, 0, avctx->width * avctx->height * (c->bpp / 8)); - c->decode_intra= decode_intra; + c->decode_intra = zmbv_decode_intra; } if (c->flags & ZMBV_KEYFRAME) { expected_size = avctx->width * avctx->height * (c->bpp / 8);