Yes.
Comedy is a literary or theatrical genre. Tragedy, for instance, is another. For example, Shakespeare wrote comedies, which were amusing, tragedies which were dramatic/serious, and historical plays, which were mainly factual.
Humor (or humour) is a human faculty. If a person has a sense of humor/humour, they have the ability to find situations amusing.
As you can see, these words are used in different contexts. However, if you are searching for different kinds of films, for example, the 'funny' ones might be in a section called either Comedy (i.e. they are comedy films) or Humor/Humour (i.e. that they will appeal to people's sense of humour). In this situation, the two words might be used to mean the same thing.