RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libvpxenc: quiet coded_frame deprecation warnings 

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Zern <jzern@google.com>
This commit is contained in:
James Zern 2015-07-28 22:44:54 -07:00
parent 6ce3d9fc4a
commit 88df16fe6d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/libvpxenc.c
View File

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