diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-11-15 16:21:41 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2012-11-16 13:18:28 +0100 |
| commit | e6160bda98641b7d4f86de15761ad2a962f21a36 (patch) | |
| tree | 1cc67ac8aae67a45526bf8be92b9c76285387acd /libavcodec | |
| parent | 60b6b8c019723bdb3227e1476d706c7989bb94bf (diff) | |
| download | ffmpeg-e6160bda98641b7d4f86de15761ad2a962f21a36.tar.gz | |
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@libav.org
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 08957da904..f45c572a41 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; |