| Message ID | 5270aeb3-9ab6-50d5-ded4-5b8e8c67430e@carpalis.nl |
|---|---|
| State | Accepted |
| Commit | 2b86472a65b7fe48f8467b669462b7972cc2f1ae |
| Headers | show |
On Fri, May 18, 2018 at 05:06:32PM +0200, Jerome Borsboom wrote: > 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> > --- > libavcodec/vc1dec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) will apply thx [...]
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 750f4dff1c..fdbc852ec2 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1082,7 +1082,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);
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> --- libavcodec/vc1dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)