avcodec/vc1: fix calculation of the last line of a slice
authorJerome Borsboom <jerome.borsboom@carpalis.nl>
Fri, 18 May 2018 15:06:32 +0000 (17:06 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 20 May 2018 11:17:36 +0000 (13:17 +0200)
Only for the last slice of the first field is the last line of the slice
equal to the height of the field.

Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/vc1dec.c

index 40a3e50..4f7b20a 100644 (file)
@@ -1029,7 +1029,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
                     av_log(v->s.avctx, AV_LOG_ERROR, "first field slice count too large\n");
                     continue;
                 }
-                s->end_mb_y = (i <= n_slices1 + 1) ? mb_height : FFMIN(mb_height, slices[i].mby_start % mb_height);
+                s->end_mb_y = (i == n_slices1 + 1) ? mb_height : FFMIN(mb_height, slices[i].mby_start % mb_height);
             }
             if (s->end_mb_y <= s->start_mb_y) {
                 av_log(v->s.avctx, AV_LOG_ERROR, "end mb y %d %d invalid\n", s->end_mb_y, s->start_mb_y);