* commit '50c449ac':
  iff: validate CMAP palette size
  asfenc: return error on negative timestamp

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