Skip to content

F
ffmpeg.wasm-core
Commit 376ee206 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

h263dec: restore error concealment functionality after merge 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 8bc7fe4d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/h263dec.c
View file @ 376ee206
...@@ -310,7 +310,7 @@ static int decode_slice(MpegEncContext *s){ ...@@ -310,7 +310,7 @@ static int decode_slice(MpegEncContext *s){
max_extra+= 17; max_extra+= 17;
/* buggy padding but the frame should still end approximately at the bitstream end */ /* buggy padding but the frame should still end approximately at the bitstream end */
if((s->workaround_bugs&FF_BUG_NO_PADDING) && (s->err_recognition&AV_EF_BUFFER)) if((s->workaround_bugs&FF_BUG_NO_PADDING) && (s->err_recognition&(AV_EF_BUFFER|AV_EF_AGGRESSIVE)))
max_extra+= 48; max_extra+= 48;
else if((s->workaround_bugs&FF_BUG_NO_PADDING)) else if((s->workaround_bugs&FF_BUG_NO_PADDING))
max_extra+= 256*256*256*64; max_extra+= 256*256*256*64;
......
libavcodec/ituh263dec.c
View file @ 376ee206
...@@ -484,7 +484,7 @@ static int h263_decode_block(MpegEncContext * s, DCTELEM * block, ...@@ -484,7 +484,7 @@ static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
level = get_bits(&s->gb, 8); level = get_bits(&s->gb, 8);
if((level&0x7F) == 0){ if((level&0x7F) == 0){
av_log(s->avctx, AV_LOG_ERROR, "illegal dc %d at %d %d\n", level, s->mb_x, s->mb_y); av_log(s->avctx, AV_LOG_ERROR, "illegal dc %d at %d %d\n", level, s->mb_x, s->mb_y);
if(s->err_recognition & AV_EF_BITSTREAM) if(s->err_recognition & (AV_EF_BITSTREAM|AV_EF_COMPLIANT))
return -1; return -1;
} }
if (level == 255) if (level == 255)
......
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