diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:29:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 21:29:31 +0100 |
| commit | 3832db1223999819e2846284292ea6f3ef1b1c49 (patch) | |
| tree | c9d773d7af3a65c2e802b39d6344cd695474461e | |
| parent | 2a4d9b9af09c7b6069fe8150a39a9c75d99c8aee (diff) | |
| parent | 57c36de7265761dd94fb6bb4a9180011f796128f (diff) | |
| download | ffmpeg-3832db1223999819e2846284292ea6f3ef1b1c49.tar.gz | |
Merge commit '57c36de7265761dd94fb6bb4a9180011f796128f' into release/0.10
* commit '57c36de7265761dd94fb6bb4a9180011f796128f':
vp8: avoid race condition on segment map.
Conflicts:
libavcodec/vp8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vp8.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 716812a4bd..bfc34ca4fe 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -643,7 +643,7 @@ void decode_mb_mode(VP8Context *s, VP8Macroblock *mb, int mb_x, int mb_y, uint8_ if (s->segmentation.update_map) { int bit = vp56_rac_get_prob(c, s->prob->segmentid[0]); *segment = vp56_rac_get_prob(c, s->prob->segmentid[1+bit]) + 2*bit; - } else + } else if (s->segmentation.enabled) *segment = ref ? *ref : *segment; s->segment = *segment; |