mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-23 14:56:44 +00:00
Merge commit 'a6a4596e12192375e1d9dffeae24d6d4c41b25c1'
* commit 'a6a4596e12192375e1d9dffeae24d6d4c41b25c1':
tcp: Explicitly convert a pointer to a boolean integer
Conflicts:
libavformat/tcp.c
See: 22fbc7f8be
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
16ae64ce24