From fd1ef13bb4ac13f330178b4c2d67a62d3aaf46d9 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 30 Nov 2009 19:15:19 +0000
Subject: [PATCH] Disable error resilience for field pictures, this was never
supported, results where more or less random but should not have crashed.
Originally committed as revision 20671 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/error_resilience.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index a5cf9ad8a82..3c0d2773fdc 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -685,6 +685,7 @@ void ff_er_frame_end(MpegEncContext *s){
if(!s->error_recognition || s->error_count==0 || s->avctx->lowres ||
s->avctx->hwaccel ||
s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ||
+ s->picture_structure != PICT_FRAME || // we dont support ER of field pictures yet, though it should not crash if enabled
s->error_count==3*s->mb_width*(s->avctx->skip_top + s->avctx->skip_bottom)) return;
if(s->current_picture.motion_val[0] == NULL){
--
GitLab