From 88df16fe6dd18e98244238f93ce9ff7f6c2fc216 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Tue, 28 Jul 2015 22:44:54 -0700
Subject: [PATCH] libvpxenc: quiet coded_frame deprecation warnings
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Zern <jzern@google.com>
---
libavcodec/libvpxenc.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index fb412b7756..1a1d55f8f5 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -717,12 +717,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (cx_frame->have_sse) {
int i;
/* Beware of the Y/U/V/all order! */
+#if FF_API_CODED_FRAME
+FF_DISABLE_DEPRECATION_WARNINGS
avctx->coded_frame->error[0] = cx_frame->sse[1];
avctx->coded_frame->error[1] = cx_frame->sse[2];
avctx->coded_frame->error[2] = cx_frame->sse[3];
avctx->coded_frame->error[3] = 0; // alpha
- for (i = 0; i < 4; ++i) {
- avctx->error[i] += avctx->coded_frame->error[i];
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+ for (i = 0; i < 3; ++i) {
+ avctx->error[i] += cx_frame->sse[i + 1];
}
cx_frame->have_sse = 0;
}