diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2009-11-29 01:50:43 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-11-29 01:50:43 +0000 |
| commit | 9d13016690a6e299aa8289550225df84f4a7fa30 (patch) | |
| tree | 2ca7ad3b575d6f86d951f325a89f7c78e47365d6 /libavcodec | |
| parent | 1c3260939dc61e410d4eaa5ee4eb184f0830ae55 (diff) | |
| download | ffmpeg-9d13016690a6e299aa8289550225df84f4a7fa30.tar.gz | |
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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpeg12.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index b48d62679d..196930c463 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]; |