ffmpeg | branch: master | Lynne <[email protected]> | Wed Nov 25 23:46:29 2020 
+0100| [18933dbde04eaf70975543d848ad24e2a2a9ab6e] | committer: Lynne

libdav1d: correctly copy ar_coeffs_uv to our struct

Our struct is a [2][25], libdav1d's is a [2][25 + 3] so the last 3
v coefficients were missing.
Copy each plane's coefficients separately.

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

 libavcodec/libdav1d.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index c9b439a007..04587b88da 100644
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@@ -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,

_______________________________________________
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