diff options
author | Loren Merritt <lorenm@u.washington.edu> | 2005-05-03 21:49:18 +0000 |
---|---|---|
committer | Loren Merritt <lorenm@u.washington.edu> | 2005-05-03 21:49:18 +0000 |
commit | a55f20bd9a659416efa0cc53af04911b199be747 (patch) | |
tree | ba1ca0fa208f55dc59a9f840228f35cd2364fdcd /libavcodec/h264.c | |
parent | 7c33ad19fd55fea2d39d040c7ebdcde0e1e9d864 (diff) | |
download | ffmpeg-a55f20bd9a659416efa0cc53af04911b199be747.tar.gz |
fix storage of motion vectors for frames with more than 4096 macroblocks.
Originally committed as revision 4175 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r-- | libavcodec/h264.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index e315818f19..8fe10b7e9a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -209,8 +209,8 @@ typedef struct H264Context{ */ int block_offset[2*(16+8)]; - uint16_t *mb2b_xy; //FIXME are these 4 a good idea? - uint16_t *mb2b8_xy; + uint32_t *mb2b_xy; //FIXME are these 4 a good idea? + uint32_t *mb2b8_xy; int b_stride; //FIXME use s->b4_stride int b8_stride; @@ -2667,8 +2667,8 @@ static int alloc_tables(H264Context *h){ memset(h->slice_table_base, -1, big_mb_num * sizeof(uint8_t)); h->slice_table= h->slice_table_base + s->mb_stride + 1; - CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint16_t)); - CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint16_t)); + CHECKED_ALLOCZ(h->mb2b_xy , big_mb_num * sizeof(uint32_t)); + CHECKED_ALLOCZ(h->mb2b8_xy , big_mb_num * sizeof(uint32_t)); for(y=0; y<s->mb_height; y++){ for(x=0; x<s->mb_width; x++){ const int mb_xy= x + y*s->mb_stride; |