From 9d13016690a6e299aa8289550225df84f4a7fa30 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 29 Nov 2009 01:50:43 +0000 Subject: [PATCH] Make sure field_select is not set to nonsensical values even if unused. Fixed an assert failure. Originally committed as revision 20646 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpeg12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index b48d626..196930c 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1847,7 +1847,7 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, s->mv[0][0][0] = s->mv[0][0][1] = 0; s->last_mv[0][0][0] = s->last_mv[0][0][1] = 0; s->last_mv[0][1][0] = s->last_mv[0][1][1] = 0; - s->field_select[0][0]= s->picture_structure - 1; + s->field_select[0][0]= (s->picture_structure - 1) & 1; } else { /* if B type, reuse previous vectors and directions */ s->mv[0][0][0] = s->last_mv[0][0][0]; -- 2.7.4