From df820af2c5028a446c71fa7db36f2c0f35f8488e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 3 May 2016 00:39:34 +0200 Subject: [PATCH] avcodec/error_resilience: Improve missing slice handling for mpeg2 Fixes: m702_2.avi Signed-off-by: Michael Niedermayer --- libavcodec/error_resilience.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 20af4360eb..b2e1465b96 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -884,7 +884,7 @@ void ff_er_frame_end(ERContext *s) if ( mb_x == s->mb_width && s->avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO - && (s->avctx->height&16) + && (FFALIGN(s->avctx->height, 16)&16) && s->error_count == 3 * s->mb_width * (s->avctx->skip_top + s->avctx->skip_bottom + 1) ) { av_log(s->avctx, AV_LOG_DEBUG, "ignoring last missing slice\n"); -- 2.11.0