* commit '3ca1dd25':
  xl: Make sure the width is valid

Conflicts:
	libavcodec/xl.c

See: 94b42da6Merged-by: Michael Niedermayer <michaelni@gmx.at>