[FFmpeg-cvslog] libvpxenc: quiet coded_frame deprecation warnings

James Zern git at videolan.org
Thu Jul 30 05:00:15 CEST 2015


ffmpeg | branch: master | James Zern <jzern at google.com> | Tue Jul 28 22:44:54 2015 -0700| [88df16fe6dd18e98244238f93ce9ff7f6c2fc216] | committer: James Zern

libvpxenc: quiet coded_frame deprecation warnings

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: James Zern <jzern at google.com>

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

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

diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index fb412b7..1a1d55f 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;
         }



More information about the ffmpeg-cvslog mailing list