Commit 9d130166 authored by Michael Niedermayer's avatar Michael Niedermayer

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
parent 1c326093
...@@ -1847,7 +1847,7 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, ...@@ -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->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][0][0] = s->last_mv[0][0][1] = 0;
s->last_mv[0][1][0] = s->last_mv[0][1][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 { } else {
/* if B type, reuse previous vectors and directions */ /* if B type, reuse previous vectors and directions */
s->mv[0][0][0] = s->last_mv[0][0][0]; s->mv[0][0][0] = s->last_mv[0][0][0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment