From patchwork Tue Apr 23 21:11:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 12880 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 437214490C0 for ; Wed, 24 Apr 2019 00:12:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 24B0368A0FA; Wed, 24 Apr 2019 00:12:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B79F6807D4 for ; Wed, 24 Apr 2019 00:11:58 +0300 (EEST) Received: by mail-io1-f46.google.com with SMTP id u12so3326051iop.0 for ; Tue, 23 Apr 2019 14:11:58 -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=Itbvj0gm/f8KBafU8pv2JMVFVDBBtkKWyXmex/4P448=; b=KKBfbeLswnrHL3jYbE71eOPyTVGE8B0C8MMtC7UYsCXCi7NpFMAZqPnJ9iXijs2YzI QJC+M27LQD0DWEABWDp/G0UI198BiIqCcLLU4mM5HCMR4N4sg2QRJGs6CD15wmUHRx/Z +NRt6j7mc+pJWGdVqMQqWIB304sCNJnTaMNOmckcKEhtWFlkRBTyv7XmZmrVS1OCLMVC VoAfmENcZ9q8iTjdUi8ziErF+5gsI2D0S4ZSAs82NDuhKPHMZ6Rv3ib3YoVm6WN6a3hE MBDbj4iOUb1aeVGe/D89G872hXj5BQX1/6NOeSgHvX6R/81o3tEv9PwWbYuxXErZei4j d8Xg== 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=Itbvj0gm/f8KBafU8pv2JMVFVDBBtkKWyXmex/4P448=; b=AIF6laj9574P9VX5f+cURQTHI2KmYGdTDnKYToFmas3DHCkm8ZLts7ZX8a4kHj1DNt quFRjKrPaMC7M4M5mVi2MiKVpe+vQddy1Lakn2671UfsssUgEmxQHsOLzmvVkKT3PwGn OTvihvCgH6vpucfUbQ8VK1a/0O7PzP3fkLCT8CSFqZcN1N5nGZFqbBj8QGA+R89k1qdJ wyT9iruYAJPaAGc6znWIK2SkY9I184NEq3U++1D6SAobjJof0CqdWi2c0COy+h6/RqdU ll+3kxh9zU8gr1UtAeC3BYU41pKPHhxdfhCq+h83IgmDGmOTycGYMgMHX3HjT4AEcH1j 4Npw== X-Gm-Message-State: APjAAAV9oM0Q2aMsPwjVgVeZbth0BT5P68JuF6pzSdzx/QKlRA+SJjO8 oG1qFsIbyBTXR+H8bGe0CT0I0hd1+/k6ReSQ4AU7mQ== X-Google-Smtp-Source: APXvYqz9q5vOjETNRQ7VXnJV34kLRnLoOnh4VQaywRD/Fdg02WeiQ60vywSuz0tRGFfGp2Hg0QfQ+HJx4YXP8iPeV5I= X-Received: by 2002:a6b:7401:: with SMTP id s1mr19395506iog.55.1556053916605; Tue, 23 Apr 2019 14:11:56 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a05:6638:97:0:0:0:0 with HTTP; Tue, 23 Apr 2019 14:11:55 -0700 (PDT) From: Carl Eugen Hoyos Date: Tue, 23 Apr 2019 23:11:55 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavfi/frei0r: Fix union and remove unneeded cast 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! I failed to test attached patch but it seems like a more useful fix for the following (past) warning: libavfilter/vf_frei0r.c:130:17: warning: assignment to ‘char **’ from incompatible pointer type ‘char *’ Please comment, Carl Eugen From c0d6001012f3da95ee493905c7411dc20839f4c8 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 23 Apr 2019 23:09:01 +0200 Subject: [PATCH] lavfi/frei0r: Fix a union entry and remove an unneeded cast. --- libavfilter/vf_frei0r.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index 165fbd7..5d38405 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -93,7 +93,7 @@ static int set_param(AVFilterContext *ctx, f0r_param_info_t info, int index, cha double d; f0r_param_color_t col; f0r_param_position_t pos; - f0r_param_string *str; + f0r_param_string str; } val; char *tail; uint8_t rgba[4]; @@ -127,7 +127,7 @@ static int set_param(AVFilterContext *ctx, f0r_param_info_t info, int index, cha break; case F0R_PARAM_STRING: - val.str = (f0r_param_string *)param; + val.str = param; break; } -- 1.7.10.4