diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-02-27 09:58:29 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-02-27 09:58:29 -0800 |
| commit | 02a31e6b3c3b48886d8f2b824bc47769fcca0419 (patch) | |
| tree | 258bfdbbc79812761440ede07a992cd21a254364 /vp8/decoder | |
| parent | 313bfbb6a29bf7c60d9a9e33397ed82a8d11fe2d (diff) | |
| parent | e8223bd2503937db12abb5800292a57be2f02e85 (diff) | |
| download | libvpx-02a31e6b3c3b48886d8f2b824bc47769fcca0419.tar libvpx-02a31e6b3c3b48886d8f2b824bc47769fcca0419.tar.gz libvpx-02a31e6b3c3b48886d8f2b824bc47769fcca0419.tar.bz2 libvpx-02a31e6b3c3b48886d8f2b824bc47769fcca0419.zip | |
Merge "decoder: reset segmentation map on keyframes"
Diffstat (limited to 'vp8/decoder')
| -rw-r--r-- | vp8/decoder/decodframe.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index ad86ea5d3..1ac868ff6 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -827,6 +827,12 @@ int vp8_decode_frame(VP8D_COMP *pbi) } } } + else + { + /* No segmentation updates on this frame */ + xd->update_mb_segmentation_map = 0; + xd->update_mb_segmentation_data = 0; + } /* Read the loop filter level and type */ pc->filter_type = (LOOPFILTERTYPE) vp8_read_bit(bc); |