[FFmpeg-cvslog] Merge commit 'a6a4596e12192375e1d9dffeae24d6d4c41b25c1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 10 09:52:51 2013 +0200| [16ae64ce244a975dc160bef30905de27a8dd34aa] | committer: Michael Niedermayer

Merge commit 'a6a4596e12192375e1d9dffeae24d6d4c41b25c1'

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

Conflicts:
	libavformat/tcp.c

See: 22fbc7f8becdee1fd6ab7cac93ae23d6022e9a56
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16ae64ce244a975dc160bef30905de27a8dd34aa
---