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)
commit16ae64ce244a975dc160bef30905de27a8dd34aa
tree99e0959dc349788dce8968cc658970d250ae3e79
parentf7003c7a3bc6233e6070fb6b423181a870b0f73a
parenta6a4596e12192375e1d9dffeae24d6d4c41b25c1
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@gmx.at>