Re: [FFmpeg-devel] [PATCH 4/5] avcodec/vc1: fix calculation of the last line of a slice

2018-05-19 Thread Michael Niedermayer
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 
> ---
>  libavcodec/vc1dec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply

thx

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Does the universe only have a finite lifespan? No, its going to go on
forever, its just that you wont like living in it. -- Hiranya Peiri


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


[FFmpeg-devel] [PATCH 4/5] avcodec/vc1: fix calculation of the last line of a slice

2018-05-18 Thread Jerome Borsboom
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 
---
 libavcodec/vc1dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
-- 
2.13.6


___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel