Mercurial > libavcodec.hg
changeset 1451:62c16edd18c6 libavcodec
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
author | michaelni |
---|---|
date | Tue, 09 Sep 2003 19:46:21 +0000 |
parents | 357c19b0b27b |
children | 37dc515e3dac |
files | mpegvideo.c |
diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegvideo.c Tue Sep 09 19:03:14 2003 +0000 +++ b/mpegvideo.c Tue Sep 09 19:46:21 2003 +0000 @@ -3327,7 +3327,6 @@ #ifdef CONFIG_RISKY /* we need to initialize some time vars before we can encode b-frames */ // RAL: Condition added for MPEG1VIDEO - //FIXME figure out why mpeg1/2 need this !!! 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); #endif @@ -3746,9 +3745,11 @@ s->tex_pb= backup_s.tex_pb; } s->last_bits= get_bit_count(&s->pb); - + +#ifdef CONFIG_RISKY if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) ff_h263_update_motion_val(s); +#endif if(next_block==0){ s->dsp.put_pixels_tab[0][0](s->dest[0], s->me.scratchpad , s->linesize ,16); @@ -3912,9 +3913,11 @@ // RAL: Update last macrobloc type s->last_mv_dir = s->mv_dir; +#ifdef CONFIG_RISKY if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) ff_h263_update_motion_val(s); - +#endif + MPV_decode_mb(s, s->block); }