Merge commit 'a6a4596e12192375e1d9dffeae24d6d4c41b25c1'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Sep 2013 07:52:51 +0000 (09:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Sep 2013 08:00:09 +0000 (10:00 +0200)
* commit 'a6a4596e12192375e1d9dffeae24d6d4c41b25c1':
  tcp: Explicitly convert a pointer to a boolean integer

Conflicts:
libavformat/tcp.c

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

Trivial merge