diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-07-29 02:09:12 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-07-29 02:09:12 +0000 |
| commit | 7d1c3fc1d683d53982a1dec14f0f9749a07ae48d (patch) | |
| tree | 23a9984eef372f9710641e2cb6f302ea9af1727f /libavcodec/h263dec.c | |
| parent | 80adda8efd35c920c7ba0c43d530102a2fd22bc3 (diff) | |
rate distortion mb decision support
fix decoding of old %16!=0 divx
fix assertion failure in motion_est.c
Originally committed as revision 2094 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 01defcd721..332eb3b3b7 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -209,6 +209,9 @@ static int decode_slice(MpegEncContext *s){ //printf("%d %d %06X\n", ret, get_bits_count(&s->gb), show_bits(&s->gb, 24)); ret= s->decode_mb(s, s->block); + if (s->pict_type!=B_TYPE) + ff_h263_update_motion_val(s); + if(ret<0){ const int xy= s->mb_x + s->mb_y*s->mb_stride; if(ret==SLICE_END){ @@ -533,6 +536,9 @@ retry: if(s->divx_version && s->divx_version<500){ s->workaround_bugs|= FF_BUG_EDGE; } + + if(s->avctx->codec_tag == ff_get_fourcc("DIVX") && s->divx_version==0 && s->lavc_build==0 && s->xvid_build==0 && s->vo_type==0 && s->vol_control_parameters==0 && s->low_delay) + s->workaround_bugs|= FF_BUG_EDGE; #if 0 if(s->divx_version==500) |