diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-03-23 02:17:04 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-03-23 02:17:04 +0000 |
| commit | fc4a2d1e8cc06766677d33f4ba4777e256a709fc (patch) | |
| tree | 8f9367153e7bae75ded7c2ba79bc088167507feb /libavcodec/mpeg4video.c | |
| parent | 19de452a630f0906ef3ebda4f27ca7b2a4b59f07 (diff) | |
| download | ffmpeg-fc4a2d1e8cc06766677d33f4ba4777e256a709fc.tar.gz | |
Change ref_index structure so it matches how its organized in h264.
Also revert the related error concealment hotfix.
Originally committed as revision 22640 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg4video.c')
| -rw-r--r-- | libavcodec/mpeg4video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg4video.c b/libavcodec/mpeg4video.c index a647960a51..dd4dd8ad95 100644 --- a/libavcodec/mpeg4video.c +++ b/libavcodec/mpeg4video.c @@ -137,7 +137,7 @@ int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my){ } else if(IS_INTERLACED(colocated_mb_type)){ s->mv_type = MV_TYPE_FIELD; for(i=0; i<2; i++){ - int field_select= s->next_picture.ref_index[0][s->block_index[2*i]]; + int field_select= s->next_picture.ref_index[0][4*mb_index + 2*i]; s->field_select[0][i]= field_select; s->field_select[1][i]= i; if(s->top_field_first){ |