--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
Originally committed as revision 2243 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
9d90c37f39
commit
2523e73c77
@ -3327,7 +3327,6 @@ static void encode_picture(MpegEncContext *s, int picture_number)
|
||||
#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 @@ static void encode_picture(MpegEncContext *s, int picture_number)
|
||||
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 @@ static void encode_picture(MpegEncContext *s, int picture_number)
|
||||
// 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);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user