summaryrefslogtreecommitdiffstats
path: root/libavcodec/vp9.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2014-08-12 18:11:05 -0400
committerAnton Khirnov <anton@khirnov.net>2016-10-04 10:54:07 +0200
commita451324dddf5d2ab4bcd6aa0f546596f71bdada3 (patch)
treea88600218b73f967f1089cddb4f3f4af8c493129 /libavcodec/vp9.c
parentdc3fe45fca9c10c4af6bfcf48eb7b81968892ef9 (diff)
downloadffmpeg-streaming-a451324dddf5d2ab4bcd6aa0f546596f71bdada3.zip
ffmpeg-streaming-a451324dddf5d2ab4bcd6aa0f546596f71bdada3.tar.gz
vp9: ignore reference segmentation map if error_resilience flag is set.
Fixes ffvp9_fails_where_libvpx.succeeds.webm. Bug-Id: ffmpeg/3849. Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/vp9.c')
-rw-r--r--libavcodec/vp9.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 32d995f..9062185 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -64,7 +64,7 @@ static int vp9_frame_alloc(AVCodecContext *avctx, VP9Frame *f)
f->mv = (VP9MVRefPair*)f->mv_buf->data;
if (s->segmentation.enabled && !s->segmentation.update_map &&
- !s->keyframe && !s->intraonly)
+ !s->keyframe && !s->intraonly && !s->errorres)
memcpy(f->segmentation_map, s->frames[LAST_FRAME].segmentation_map, sz);
return 0;
OpenPOWER on IntegriCloud