Commit 66acaee0 authored by michaelni's avatar michaelni

fixing slice decoding, dunno why the regression tests didnt catch that ...


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1744 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 41c1d009
...@@ -614,13 +614,13 @@ void ff_er_add_slice(MpegEncContext *s, int startx, int starty, int endx, int en ...@@ -614,13 +614,13 @@ void ff_er_add_slice(MpegEncContext *s, int startx, int starty, int endx, int en
s->error_status_table[i] &= mask; s->error_status_table[i] &= mask;
} }
} }
s->error_status_table[start_xy] |= VP_START;
if(end_xy < s->mb_num){ if(end_xy < s->mb_num){
s->error_status_table[end_xy] &= mask; s->error_status_table[end_xy] &= mask;
s->error_status_table[end_xy] |= status; s->error_status_table[end_xy] |= status;
} }
s->error_status_table[start_xy] |= VP_START;
} }
void ff_er_frame_end(MpegEncContext *s){ void ff_er_frame_end(MpegEncContext *s){
......
...@@ -484,7 +484,7 @@ retry: ...@@ -484,7 +484,7 @@ retry:
avctx->has_b_frames= !s->low_delay; avctx->has_b_frames= !s->low_delay;
if(s->workaround_bugs&FF_BUG_AUTODETECT){ if(s->workaround_bugs&FF_BUG_AUTODETECT){
if(s->padding_bug_score > -2 && !s->data_partitioning) if(s->padding_bug_score > -2 && !s->data_partitioning && !s->resync_marker)
s->workaround_bugs |= FF_BUG_NO_PADDING; s->workaround_bugs |= FF_BUG_NO_PADDING;
else else
s->workaround_bugs &= ~FF_BUG_NO_PADDING; s->workaround_bugs &= ~FF_BUG_NO_PADDING;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment