diff options
author | Loren Merritt <lorenm@u.washington.edu> | 2006-05-28 22:44:14 +0000 |
---|---|---|
committer | Loren Merritt <lorenm@u.washington.edu> | 2006-05-28 22:44:14 +0000 |
commit | 5d18eaad1349342b910f41fff5e49f9b4d6f033f (patch) | |
tree | 0e51de276bb6b3709d335c4edbc6887d7b91d8ba /libavcodec/mpegvideo.c | |
parent | 67a8208695d6fcf604d756cd4a699555ddb1ee30 (diff) | |
download | ffmpeg-5d18eaad1349342b910f41fff5e49f9b4d6f033f.tar.gz |
h264: MBAFF interlaced decoding
Originally committed as revision 5419 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index f5d514c8ff..222f63f009 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -487,8 +487,8 @@ static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base){ int i; // edge emu needs blocksize + filter length - 1 (=17x17 for halfpel / 21x21 for h264) - CHECKED_ALLOCZ(s->allocated_edge_emu_buffer, (s->width+64)*2*17*2); //(width + edge + align)*interlaced*MBsize*tolerance - s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*17; + CHECKED_ALLOCZ(s->allocated_edge_emu_buffer, (s->width+64)*2*21*2); //(width + edge + align)*interlaced*MBsize*tolerance + s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*21; //FIXME should be linesize instead of s->width*2 but that isnt known before get_buffer() CHECKED_ALLOCZ(s->me.scratchpad, (s->width+64)*4*16*2*sizeof(uint8_t)) |