aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-09-30 00:28:13 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-09-30 00:28:13 +0000
commit8c07cee91a82212ef2e8bb2300aa5a8cc0a13df0 (patch)
tree2c7fb8df435a3c3fba9e72e0add07029383bf8cd /libavcodec
parent15ae1959d8c30db13e612db0d099ec106948cfb4 (diff)
downloadffmpeg-8c07cee91a82212ef2e8bb2300aa5a8cc0a13df0.tar.gz
Do not attempt to perform error concealment in lowres mode as this is
not supported currently. Originally committed as revision 15465 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/error_resilience.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 1c9a07ca84..f15b0b6cda 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -680,7 +680,7 @@ void ff_er_frame_end(MpegEncContext *s){
int size = s->b8_stride * 2 * s->mb_height;
Picture *pic= s->current_picture_ptr;
- if(!s->error_recognition || s->error_count==0 ||
+ if(!s->error_recognition || s->error_count==0 || s->avctx->lowres ||
s->error_count==3*s->mb_width*(s->avctx->skip_top + s->avctx->skip_bottom)) return;
if(s->current_picture.motion_val[0] == NULL){