Merge commit 'a6a4596e'

* commit 'a6a4596e':
  tcp: Explicitly convert a pointer to a boolean integer

Conflicts:
	libavformat/tcp.c

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