h264: Fix parameters to ff_er_add_slice() call
authorReinhard Tartler <siretart@tauware.de>
Sat, 12 Jan 2013 18:22:22 +0000 (19:22 +0100)
committerReinhard Tartler <siretart@tauware.de>
Sat, 12 Jan 2013 18:22:22 +0000 (19:22 +0100)
commitce8910d861c14a7fcc1c550380e1011a3a3b3e8c
tree4fa3fff6aa25a83b10fd02d307817d60def744d7
parent3d0c9c9af687fd2dd4fbaefdb4d7d85c59f7d19f
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.

(cherry picked from commit e6160bda98641b7d4f86de15761ad2a962f21a36)

Conflicts:

libavcodec/h264.c

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Conflicts:

libavcodec/h264.c
libavcodec/h264.c