* commit '3867f371':
  lavf: remove a pointless check

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