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/mpegvideo.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/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 1dbe7eda96..b47ff9adb1 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -296,7 +296,7 @@ int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared){ for(i=0; i<2; i++){ FF_ALLOCZ_OR_GOTO(s->avctx, pic->motion_val_base[i], 2 * (b8_array_size+4) * sizeof(int16_t), fail) pic->motion_val[i]= pic->motion_val_base[i]+4; - FF_ALLOCZ_OR_GOTO(s->avctx, pic->ref_index[i], b8_array_size * sizeof(uint8_t), fail) + FF_ALLOCZ_OR_GOTO(s->avctx, pic->ref_index[i], 4*mb_array_size * sizeof(uint8_t), fail) } pic->motion_subsample_log2= 3; } |