OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
91459bd
)
avformat/network: add union for avoiding strict aliassing violations with sockaddr*
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 11 Sep 2014 23:52:38 +0000
(
01:52
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 15 Sep 2014 11:31:00 +0000
(13:31 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/network.h
patch
|
blob
|
history
diff --git
a/libavformat/network.h
b/libavformat/network.h
index
d89a62d
..
d4e1a89
100644
(file)
--- a/
libavformat/network.h
+++ b/
libavformat/network.h
@@
-72,6
+72,14
@@
int ff_neterrno(void);
#include <poll.h>
#endif
+typedef union sockaddr_union {
+ struct sockaddr_storage storage;
+ struct sockaddr_in in;
+#if HAVE_STRUCT_SOCKADDR_IN6
+ struct sockaddr_in6 in6;
+#endif
+} sockaddr_union;
+
int ff_socket_nonblock(int socket, int enable);
extern int ff_network_inited_globally;