X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ferror_resilience.c;h=b2e1465b968f7cb1d1bf4c910e61244686119095;hb=93a0f4a3cbb823b2ddcb66a3a4c8f08aa7934078;hp=20af4360eb0a88bb3e4d0fe310800556bf47e65d;hpb=28abb216cbd5736d65973165b830c08815ce0227;p=ffmpeg

diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 20af4360eb0..b2e1465b968 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");