[FFmpeg-cvslog] h264: Fix parameters to ff_er_add_slice() call
Janne Grunau
git at videolan.org
Sat Nov 17 13:03:17 CET 2012
ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Thu Nov 15 16:21:41 2012 +0100| [e6160bda98641b7d4f86de15761ad2a962f21a36] | committer: Janne Grunau
h264: Fix parameters to ff_er_add_slice() call
s->mb_x is reset to zero a couple of lines above. It does not make
sense to call ff_er_add_slice() with 0 as endx when the end of the
macroblock row was reached. Fixes unnecessary and counterproductive
error resilience in https://bugzilla.libav.org/show_bug.cgi?id=394.
CC: libav-stable at libav.org
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6160bda98641b7d4f86de15761ad2a962f21a36
---
libavcodec/h264.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 08957da..f45c572 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3567,7 +3567,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg)
return 0;
} else {
ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y,
- s->mb_x, s->mb_y,
+ s->mb_x - 1, s->mb_y,
ER_MB_END & part_mask);
return -1;
More information about the ffmpeg-cvslog
mailing list