generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)

Browse Source 
Originally committed as revision 2243 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2003-09-09 19:46:21 +00:00
parent 9d90c37f39
commit 2523e73c77
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/mpegvideo.c
View File

@ -3327,7 +3327,6 @@ static void encode_picture(MpegEncContext *s, int picture_number)
#ifdef CONFIG_RISKY #ifdef CONFIG_RISKY
/* we need to initialize some time vars before we can encode b-frames */ /* we need to initialize some time vars before we can encode b-frames */
// RAL: Condition added for MPEG1VIDEO // 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)) 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);
#endif #endif
@ -3746,9 +3745,11 @@ static void encode_picture(MpegEncContext *s, int picture_number)
s->tex_pb= backup_s.tex_pb; s->tex_pb= backup_s.tex_pb;
} }
s->last_bits= get_bit_count(&s->pb); s->last_bits= get_bit_count(&s->pb);
#ifdef CONFIG_RISKY
if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE)
ff_h263_update_motion_val(s); ff_h263_update_motion_val(s);
#endif
if(next_block==0){ if(next_block==0){
s->dsp.put_pixels_tab[0][0](s->dest[0], s->me.scratchpad , s->linesize ,16); 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 // RAL: Update last macrobloc type
s->last_mv_dir = s->mv_dir; s->last_mv_dir = s->mv_dir;
#ifdef CONFIG_RISKY
if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE) if (s->out_format == FMT_H263 && s->pict_type!=B_TYPE)
ff_h263_update_motion_val(s); ff_h263_update_motion_val(s);
#endif
MPV_decode_mb(s, s->block); MPV_decode_mb(s, s->block);
} }