* commit '0181ae9a':
  h264: Make sure reinit failures mark the context as not initialized

Conflicts:
	libavcodec/h264_slice.c

See: e8714f6fMerged-by: Michael Niedermayer <michaelni@gmx.at>