* qatar/master:
  lavf: fix the comparison in an overflow check

Conflicts:
	libavformat/utils.c

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