libvpxenc: quiet coded_frame deprecation warnings

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Zern <jzern@google.com>
pull/161/head
James Zern 10 years ago
parent 6ce3d9fc4a
commit 88df16fe6d
  1. 8
      libavcodec/libvpxenc.c

@ -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;
} }

Loading…
Cancel
Save