From patchwork Fri Nov 27 01:16:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 24098 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 DC34544BC55 for ; Fri, 27 Nov 2020 03:16:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AAE8A68BA1D; Fri, 27 Nov 2020 03:16:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D89C468A98A for ; Fri, 27 Nov 2020 03:16:32 +0200 (EET) Received: from w3.tutanota.de (unknown [192.168.1.164]) by w4.tutanota.de (Postfix) with ESMTP id 66BC910602D4 for ; Fri, 27 Nov 2020 01:16:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1606439792; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=dCrNEaEbJ+wfJHFJbOi6xwpNfhLgNc8bPt7P/8Ppofk=; b=HL4Smo4MqA3W4SMMwzN8Vn+bAvtYDQ2+FY5U25nvQqg5GuDNjYaLg9JFk1G2Dm5o Z9FdJDGmwNKLdXn9E8yldrnVvL7H/gF4bGDB0yLmBKiY9NXBd6NnExQ4JWPMDv1n0JR IO/V3wjBxiqrwwhtRMM0v6ScECg2mUtZn6D3WA2Z8zFSH3doffwBPWDXfwDpYsqEfbl YsplbUSKSYAQNRFzOgNai87EzL1vAIr1cWbcIgisYih6nKzEhFBcIBX07z8FlLDmasV YzDOoLjJyNT0yNEIYIvHadmH9+jQviJ5rEVDnXRg2MFID7t8+SYJLhu6HXZ57EPvKnn oT8eu/lSeQ== Date: Fri, 27 Nov 2020 02:16:32 +0100 (CET) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavu/film_grain_params: fix typo in type enum 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" Unfortunately, this wasn't caught during reviews. Patch attached. Subject: [PATCH] lavu/film_grain_params: fix typo in type enum --- libavcodec/libdav1d.c | 2 +- libavutil/film_grain_params.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 04587b88da..de57bce33d 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -406,7 +406,7 @@ FF_ENABLE_DEPRECATION_WARNINGS goto fail; } - fgp->type = AV_FILM_GRAM_PARAMS_AV1; + fgp->type = AV_FILM_GRAIN_PARAMS_AV1; fgp->seed = p->frame_hdr->film_grain.data.seed; fgp->codec.aom.num_y_points = p->frame_hdr->film_grain.data.num_y_points; fgp->codec.aom.chroma_scaling_from_luma = p->frame_hdr->film_grain.data.chroma_scaling_from_luma; diff --git a/libavutil/film_grain_params.h b/libavutil/film_grain_params.h index cdc8f623c6..6d61ebab66 100644 --- a/libavutil/film_grain_params.h +++ b/libavutil/film_grain_params.h @@ -22,12 +22,12 @@ #include "frame.h" enum AVFilmGrainParamsType { - AV_FILM_GRAM_PARAMS_NONE = 0, + AV_FILM_GRAIN_PARAMS_NONE = 0, /** * The union is valid when interpreted as AVFilmGrainAOMParams (codec.aom) */ - AV_FILM_GRAM_PARAMS_AV1, + AV_FILM_GRAIN_PARAMS_AV1, }; /**