From patchwork Fri Apr 3 23:31:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 18624 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 7951C448B1E for ; Sat, 4 Apr 2020 02:32:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 578DF68AFA5; Sat, 4 Apr 2020 02:32:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 35B3468AF38 for ; Sat, 4 Apr 2020 02:32:11 +0300 (EEST) Received: by mail-io1-f42.google.com with SMTP id q9so9488268iod.4 for ; Fri, 03 Apr 2020 16:32:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=fuLeBe8L3qVUVmD5c6t48G6EN4aUhODSEYtZTp7Llns=; b=lNyVvqRfdykdDgbyIDT3kLUTP1PBG2KWzhNuNYsLxfG972Za/Ry9+AWaaumWCS3Mqw PGhSw18xPP4+NLgrNQ6IixkLqsO46B8V0pLUNhr0N0KM2mOJasU5IUu5+9iPpgKKdWWe +VjJJEhsTZ/c8iB+0GcDCVC+vsA5CJ89u+hMkhQ17SWfjynKtKroNOaCmXErPTtDHNn9 bAX5JysQ2cHsp5/MBsmAl/8LIpitB0tywoNzcYOfSMdnW+tP6r0Gkp8LRpQEP84hseor 9DK3GntLOSTPQo71VXMIKRspT1jNt0UHCoMHPzcTfRBrOyGe7hETM7p8yDdYwsgwTb74 eGDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=fuLeBe8L3qVUVmD5c6t48G6EN4aUhODSEYtZTp7Llns=; b=ggiuy3/I+u2wMjxNwSKLdTCmpE5J8HyNhSaIWFgT32qyQ35It2M1pTaxZmNEx2plSj 2uMqjADUK1AR5GHwvdwi2oECcJzJmQ7e73xVnx2VTw2/qtkMeRWEIcsiP+r6I9UBsnvQ edAyUW3XPsUniJyKMX+6olOyFUtUMrh4Yv9QPd0q9Nq8DTPrqdtCagxmntHnuhpn5XYC Q31TO7VMA3InGTxx2h3rGLnBH3wZ9Xup2d5roLsKkxRVe94M8A2xBwNRI7F4vM+WVBZr oPNACaoycoebOw80F7nbcHsdleYp2xPNXOJFMPqtKe4laC/ZIq0hssbDcAwLtQ8T558a RD8g== X-Gm-Message-State: AGi0PuZpEM2tTgYJdTKDoFZpSIG+VA/XuLzDm2BED0ro9cWMjjinVbF7 KSZ5kAEqWSZ2cl8rLnQ2dp4o/42z+DPxaJay3b8TbQ== X-Google-Smtp-Source: APiQypKjVhKOM7eY62ufMgJ2BM9iBfU/jZDv31EoGbAwgk2LyPBsDVpY8AQrPNe+Yuo85t+R/0EqEjrvZrTAsZS3B+Q= X-Received: by 2002:a02:9998:: with SMTP id a24mr4234619jal.31.1585956729223; Fri, 03 Apr 2020 16:32:09 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Sat, 4 Apr 2020 01:31:58 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf, lavfi: Remove uses of sizeof(char) 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" Hi! Attached patch removes uses of sizeof(char) from libavfilter and libavformat. Please comment, Carl Eugen From eb8c99ab8b714b8699adfb252723ee66f00cd00f Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 4 Apr 2020 01:30:14 +0200 Subject: [PATCH] lavf, lavfi: Remove uses of sizeof(char). FFmpeg relies on sizeof(char) == 1. --- libavfilter/dnn/dnn_backend_tf.c | 2 +- libavfilter/vf_deshake.c | 4 ++-- libavformat/webmdashenc.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index a921667424..9ceca5cea0 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -95,7 +95,7 @@ static TF_Tensor *allocate_input_tensor(const DNNData *input) break; case DNN_UINT8: dt = TF_UINT8; - size = sizeof(char); + size = 1; break; default: av_assert0(!"should not reach here"); diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c index b516ea2d59..28a541b94a 100644 --- a/libavfilter/vf_deshake.c +++ b/libavfilter/vf_deshake.c @@ -354,7 +354,7 @@ static av_cold int init(AVFilterContext *ctx) if (deshake->filename) deshake->fp = fopen(deshake->filename, "w"); if (deshake->fp) - fwrite("Ori x, Avg x, Fin x, Ori y, Avg y, Fin y, Ori angle, Avg angle, Fin angle, Ori zoom, Avg zoom, Fin zoom\n", sizeof(char), 104, deshake->fp); + fwrite("Ori x, Avg x, Fin x, Ori y, Avg y, Fin y, Ori angle, Avg angle, Fin angle, Ori zoom, Avg zoom, Fin zoom\n", 1, 104, deshake->fp); // Quadword align left edge of box for MMX code, adjust width if necessary // to keep right margin @@ -485,7 +485,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) // Write statistics to file if (deshake->fp) { snprintf(tmp, 256, "%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f\n", orig.vec.x, deshake->avg.vec.x, t.vec.x, orig.vec.y, deshake->avg.vec.y, t.vec.y, orig.angle, deshake->avg.angle, t.angle, orig.zoom, deshake->avg.zoom, t.zoom); - fwrite(tmp, sizeof(char), strlen(tmp), deshake->fp); + fwrite(tmp, 1, strlen(tmp), deshake->fp); } // Turn relative current frame motion into absolute by adding it to the diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index d05b265330..7847659c63 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -439,7 +439,7 @@ static int write_adaptation_set(AVFormatContext *s, int as_index) static int to_integer(char *p, int len) { int ret; - char *q = av_malloc(sizeof(char) * len); + char *q = av_malloc(len); if (!q) return AVERROR(ENOMEM); av_strlcpy(q, p, len); -- 2.24.1