summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2009-11-30 19:15:19 +0000
committerMichael Niedermayer <[email protected]>2009-11-30 19:15:19 +0000
commitfd1ef13bb4ac13f330178b4c2d67a62d3aaf46d9 (patch)
treed37bee7956399ab9a2b9f9458b4b3c2f369b767f
parent078cdecf9e469d80c160101f8b4a8bd0dbed519e (diff)
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
-rw-r--r--libavcodec/error_resilience.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index a5cf9ad8a8..3c0d2773fd 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){