ffmpeg | branch: master | Lynne <[email protected]> | Fri Nov 27 02:12:10 2020 
+0100| [2ba04670c3b6e84cc4944316cabd2fb5bfae4a68] | committer: Lynne

lavu/film_grain_params: fix typo in type enum

Ref: xkcd #1015

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ba04670c3b6e84cc4944316cabd2fb5bfae4a68
---

 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,
 };
 
 /**

_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".

Reply via email to