X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fsnowenc.c;h=7e8269cd925824aeeff3ec6575ba5e97f54f867e;hb=b3f8d871eeda38991108db7151e6c396808b22fe;hp=1f22ad55d105bb51e91070c35cbaed04b2de587c;hpb=59b55619b6edef363532825c4cf16ac2bfdd21a1;p=ffmpeg

diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index 1f22ad55d10..7e8269cd925 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -1837,7 +1837,7 @@ redo_frame:
                     }
                 }
             s->avctx->error[plane_index] += error;
-            s->current_picture->error[plane_index] = error;
+            s->encoding_error[plane_index] = error;
         }
 
     }
@@ -1869,10 +1869,16 @@ redo_frame:
     emms_c();
 
     ff_side_data_set_encoder_stats(pkt, s->current_picture->quality,
-                                   s->current_picture->error,
+                                   s->encoding_error,
                                    (s->avctx->flags&AV_CODEC_FLAG_PSNR) ? 4 : 0,
                                    s->current_picture->pict_type);
 
+#if FF_API_ERROR_FRAME
+FF_DISABLE_DEPRECATION_WARNINGS
+    memcpy(s->current_picture->error, s->encoding_error, sizeof(s->encoding_error));
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
     pkt->size = ff_rac_terminate(c);
     if (s->current_picture->key_frame)
         pkt->flags |= AV_PKT_FLAG_KEY;