diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-31 23:16:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-01 00:09:05 +0200 |
| commit | f6a8ce98a7bce601a7db4a8f2a615822dc8f71bd (patch) | |
| tree | 25eca30f64783b92220d8e75bdd8551842d22752 /libavcodec/vp8.c | |
| parent | 0abbd3adb6a28c088e121bf3da6c04225398bee4 (diff) | |
| parent | 5ac4952a5808cc8cfe01031ca9d4df7d072f453c (diff) | |
| download | ffmpeg-f6a8ce98a7bce601a7db4a8f2a615822dc8f71bd.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_drawtext: Replace FFmpeg by Libav in license boilerplate.
mpegaudiodec: remove unusued code and variables
improved 'edts' atom writing support
mpegaudio: clean up compute_antialias() definition
vp8: fix segmentation race during frame-threading.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp8.c')
| -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 9f7d5dd38d..082d8e5829 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -1612,7 +1612,7 @@ static int vp8_decode_frame(AVCodecContext *avctx, void *data, int *data_size, s->mv_min.x = -MARGIN; s->mv_max.x = ((s->mb_width - 1) << 6) + MARGIN; - if (prev_frame && s->segmentation.enabled && s->segmentation.update_map) + if (prev_frame && s->segmentation.enabled && !s->segmentation.update_map) ff_thread_await_progress(prev_frame, mb_y, 0); for (mb_x = 0; mb_x < s->mb_width; mb_x++, mb_xy++, mb++) { |