Juan Antonio Samaranch, Madrid (Madrid)