[FFmpeg-devel] lavu/film_grain_params: fix typo in type enum

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(-)

On 11/26/2020 10:16 PM, Lynne wrote:
> Unfortunately, this wasn't caught during reviews.
> 
> Patch attached.

> From b83c9e225163dfa22c3092e9b808484ada02db91 Mon Sep 17 00:00:00 2001
> From: Lynne <dev@lynne.ee>
> Date: Fri, 27 Nov 2020 02:12:10 +0100
> 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,

Something something relevant xkcd something.

>  
>      /**
>       * The union is valid when interpreted as AVFilmGrainAOMParams (codec.aom)
>       */
> -    AV_FILM_GRAM_PARAMS_AV1,
> +    AV_FILM_GRAIN_PARAMS_AV1,
>  };
>  
>  /**
> -- 
> 2.29.2.222.g5d2a92d10f8
> 

Obviously ok, so please push asap.

Nov 27, 2020, 02:23 by jamrial@gmail.com:

> On 11/26/2020 10:16 PM, Lynne wrote:
>
>> Unfortunately, this wasn't caught during reviews.
>>
>> Patch attached.
>>
>> From b83c9e225163dfa22c3092e9b808484ada02db91 Mon Sep 17 00:00:00 2001
>> From: Lynne <dev@lynne.ee>
>> Date: Fri, 27 Nov 2020 02:12:10 +0100
>> 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,
>>
>
> Something something relevant xkcd something.
>

#1015


>> /**
>>  * The union is valid when interpreted as AVFilmGrainAOMParams (codec.aom)
>>  */
>> -    AV_FILM_GRAM_PARAMS_AV1,
>> +    AV_FILM_GRAIN_PARAMS_AV1,
>>  };
>>  /**
>> -- 
>> 2.29.2.222.g5d2a92d10f8
>>
>
> Obviously ok, so please push asap.
>

Pushed, thanks.