aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/aea.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-28 13:19:11 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-10-28 13:19:11 +0100
commit8943ad40146d322f5a5bf2bab790d117ec7a4c37 (patch)
tree3aa57b91ebe60e9958219e944db3d675e6972ba7 /libavformat/aea.c
parentf9f79cb0ecb68546e6de3db6072f631bb3fbcff8 (diff)
parent4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26 (diff)
downloadffmpeg-8943ad40146d322f5a5bf2bab790d117ec7a4c37.tar.gz
Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'
* commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26': avio: fix pointer type mismatches in avio_enum_protocols() avserver: use socklen_t where appropriate udp: use socklen_t where appropriate network: use HAVE_THREADS instead of local hack af_channelmap: remove stray enum declaration buffersink: remove stray semicolon after function definition Conflicts: libavformat/avio.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aea.c')
0 files changed, 0 insertions, 0 deletions