aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-05-03 00:39:34 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-05-03 01:07:24 +0200
commitdf820af2c5028a446c71fa7db36f2c0f35f8488e (patch)
tree55ccc3c1631ff8701b8a87bc5e828ea318833b60 /libavcodec
parentce2f9fdb0a92956aedfa2c564d1374a2f1eebfbd (diff)
downloadffmpeg-df820af2c5028a446c71fa7db36f2c0f35f8488e.tar.gz
avcodec/error_resilience: Improve missing slice handling for mpeg2
Fixes: m702_2.avi Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/error_resilience.c2
1 files changed, 1 insertions, 1 deletions
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");