* commit '1dbfaa34':
  h264: only ref cur_pic in update_thread_context if it is initialized

Conflicts:
	libavcodec/h264_slice.c

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