* commit '17aa81d9':
  hqx: Merge invalid format check within switch block

Conflicts:
	libavcodec/hqx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>