* commit '34c5a666':
  h264: codec reinit: remove statements without effect

Conflicts:
	libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>