diff options
| author | James Zern <jzern@google.com> | 2015-07-28 22:44:54 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-07-29 19:59:19 -0700 |
| commit | 88df16fe6dd18e98244238f93ce9ff7f6c2fc216 (patch) | |
| tree | cc08f5c358ea671f3a2ca6023b9d2d3e6ff34ccc /libavcodec | |
| parent | 6ce3d9fc4a70958680b93c6995cc87f34630a7e3 (diff) | |
| download | ffmpeg-88df16fe6dd18e98244238f93ce9ff7f6c2fc216.tar.gz | |
libvpxenc: quiet coded_frame deprecation warnings
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Zern <jzern@google.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libvpxenc.c | 8 |
1 files 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; } |