summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4video.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-13 01:26:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-13 01:26:14 +0100
commitc9cab022a38272ef878d7e9c397475edae434bd6 (patch)
tree5c3e45d7aa4440e38998dcf2ae8b6928fc015b66 /libavcodec/mpeg4video.h
parent376ee20614507df0e6d2004b7b0d10f72cb25167 (diff)
mpeg4dec: restore error concealment functionality after merge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video.h')
-rw-r--r--libavcodec/mpeg4video.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index 00eba68c22..274ded9a1a 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -174,7 +174,7 @@ static inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, int level, int *di
}else{
level += pred;
ret= level;
- if(s->err_recognition&AV_EF_BITSTREAM){
+ if(s->err_recognition&(AV_EF_BITSTREAM|AV_EF_AGGRESSIVE)){
if(level<0){
av_log(s->avctx, AV_LOG_ERROR, "dc<0 at %dx%d\n", s->mb_x, s->mb_y);
return -1;