Commit 88df16fe authored by James Zern's avatar James Zern

libvpxenc: quiet coded_frame deprecation warnings

Reviewed-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
Signed-off-by: 's avatarJames Zern <jzern@google.com>
parent 6ce3d9fc
...@@ -717,12 +717,16 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -717,12 +717,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (cx_frame->have_sse) { if (cx_frame->have_sse) {
int i; int i;
/* Beware of the Y/U/V/all order! */ /* 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[0] = cx_frame->sse[1];
avctx->coded_frame->error[1] = cx_frame->sse[2]; avctx->coded_frame->error[1] = cx_frame->sse[2];
avctx->coded_frame->error[2] = cx_frame->sse[3]; avctx->coded_frame->error[2] = cx_frame->sse[3];
avctx->coded_frame->error[3] = 0; // alpha avctx->coded_frame->error[3] = 0; // alpha
for (i = 0; i < 4; ++i) { FF_ENABLE_DEPRECATION_WARNINGS
avctx->error[i] += avctx->coded_frame->error[i]; #endif
for (i = 0; i < 3; ++i) {
avctx->error[i] += cx_frame->sse[i + 1];
} }
cx_frame->have_sse = 0; cx_frame->have_sse = 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment