* commit '5ec0bdf2':
  h264: do not update the context fields copied between threads after finish_setup()

Conflicts:
	libavcodec/h264.h
	libavcodec/h264_slice.c

See: f111831e and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>