diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-02-26 02:48:07 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-02-26 02:48:07 +0000 |
| commit | ae35f5e14e573eeaae85675b96cc9f167f32eb0f (patch) | |
| tree | 9c13d1ca77c63031e99750111439beec170e990c /libavcodec/mpegvideo.c | |
| parent | 79c060bccb1917129bc28bd8ba688885e3c25838 (diff) | |
| download | ffmpeg-ae35f5e14e573eeaae85675b96cc9f167f32eb0f.tar.gz | |
100l (field picture decoding fix)
Originally committed as revision 2818 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 93c7198294..f208045faf 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -412,7 +412,7 @@ static int init_duplicate_context(MpegEncContext *s, MpegEncContext *base){ s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*17; //FIXME should be linesize instead of s->width*2 but that isnt known before get_buffer() - CHECKED_ALLOCZ(s->me.scratchpad, s->width*2*16*2*sizeof(uint8_t)) + CHECKED_ALLOCZ(s->me.scratchpad, (s->width+64)*2*16*2*sizeof(uint8_t)) s->rd_scratchpad= s->me.scratchpad; s->b_scratchpad= s->me.scratchpad; s->obmc_scratchpad= s->me.scratchpad + 16; @@ -3158,8 +3158,8 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) dest_cr= s->dest[2]; }else{ dest_y = s->b_scratchpad; - dest_cb= s->b_scratchpad+16*s->linesize; - dest_cr= s->b_scratchpad+16*s->linesize+8; + dest_cb= s->b_scratchpad+16*linesize; + dest_cr= s->b_scratchpad+16*linesize+8; } if (!s->mb_intra) { /* motion handling */ @@ -4642,7 +4642,7 @@ static void encode_picture(MpegEncContext *s, int picture_number) /* we need to initialize some time vars before we can encode b-frames */ // RAL: Condition added for MPEG1VIDEO if (s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO || (s->h263_pred && !s->h263_msmpeg4)) - ff_set_mpeg4_time(s, s->picture_number); + ff_set_mpeg4_time(s, s->picture_number); //FIXME rename and use has_b_frames or similar #endif s->scene_change_score=0; |