diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-09-09 19:46:21 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-09-09 19:46:21 +0000 |
| commit | 2523e73c7706ace077362eeb6869193aacb9e8c6 (patch) | |
| tree | 7053f5dd013fa6fcab3f5f556d7f65599fdc708d /libavcodec | |
| parent | 9d90c37f396201657a798fe59582218eb83fce27 (diff) | |
| download | ffmpeg-2523e73c7706ace077362eeb6869193aacb9e8c6.tar.gz | |
--disable-risky fix by (Luca Abeni <lucabe72 at email dot it>)
Originally committed as revision 2243 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index b5949e60ed..90567c0980 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -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); } |