diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-10 09:52:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-10 10:00:09 +0200 |
| commit | 16ae64ce244a975dc160bef30905de27a8dd34aa (patch) | |
| tree | 99e0959dc349788dce8968cc658970d250ae3e79 /libavformat/adxdec.c | |
| parent | f7003c7a3bc6233e6070fb6b423181a870b0f73a (diff) | |
| parent | a6a4596e12192375e1d9dffeae24d6d4c41b25c1 (diff) | |
| download | ffmpeg-16ae64ce244a975dc160bef30905de27a8dd34aa.tar.gz | |
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>
Diffstat (limited to 'libavformat/adxdec.c')
0 files changed, 0 insertions, 0 deletions