avcodec/atrac9dec: Don't create VLCs that are never used

[ffmpeg] / libavcodec / libdav1d.c

diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index c9b439a007d20f7eb5426522ee547bef207139c7..de57bce33d727f08d9f9619a31dae470ad1917b4 100644 (file)
--- 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;
@@ -425,8 +425,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
                sizeof(fgp->codec.aom.uv_points));
         memcpy(&fgp->codec.aom.ar_coeffs_y, &p->frame_hdr->film_grain.data.ar_coeffs_y,
                sizeof(fgp->codec.aom.ar_coeffs_y));
-        memcpy(&fgp->codec.aom.ar_coeffs_uv, &p->frame_hdr->film_grain.data.ar_coeffs_uv,
-               sizeof(fgp->codec.aom.ar_coeffs_uv));
+        memcpy(&fgp->codec.aom.ar_coeffs_uv[0], &p->frame_hdr->film_grain.data.ar_coeffs_uv[0],
+               sizeof(fgp->codec.aom.ar_coeffs_uv[0]));
+        memcpy(&fgp->codec.aom.ar_coeffs_uv[1], &p->frame_hdr->film_grain.data.ar_coeffs_uv[1],
+               sizeof(fgp->codec.aom.ar_coeffs_uv[1]));
         memcpy(&fgp->codec.aom.uv_mult, &p->frame_hdr->film_grain.data.uv_mult,
                sizeof(fgp->codec.aom.uv_mult));
         memcpy(&fgp->codec.aom.uv_mult_luma, &p->frame_hdr->film_grain.data.uv_luma_mult,