Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
e9d511dc
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e9d511dc
编写于
1月 18, 2007
作者:
F
François Revol
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
The long awaited BeOS cleanup, phase 1
Originally committed as revision 7581 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
453cd7a4
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
34 addition
and
54 deletion
+34
-54
libavformat/http.c
libavformat/http.c
+1
-5
libavformat/os_support.h
libavformat/os_support.h
+26
-1
libavformat/rtp.c
libavformat/rtp.c
+1
-5
libavformat/rtp_h264.c
libavformat/rtp_h264.c
+1
-5
libavformat/rtpproto.c
libavformat/rtpproto.c
+1
-5
libavformat/rtsp.c
libavformat/rtsp.c
+1
-5
libavformat/tcp.c
libavformat/tcp.c
+1
-12
libavformat/udp.c
libavformat/udp.c
+2
-16
未找到文件。
libavformat/http.c
浏览文件 @
e9d511dc
...
...
@@ -23,11 +23,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#ifndef __BEOS__
# include <arpa/inet.h>
#else
# include "barpainet.h"
#endif
#include <arpa/inet.h>
#include <netdb.h>
#include "base64.h"
...
...
libavformat/os_support.h
浏览文件 @
e9d511dc
...
...
@@ -26,12 +26,18 @@
* @file os_support.h
* miscellaneous OS support macros and functions.
*
* - socklen_t typedef (BeOS, Innotek libc)
* - usleep() (Win32, BeOS, OS/2)
* - lseek() (Win32)
* - floatf() (OS/2)
* - strcasecmp() (OS/2)
* - closesocket()
*/
#if defined(__BEOS__) || defined(__INNOTEK_LIBC__)
typedef
int
socklen_t
;
#endif
#ifdef __MINGW32__
__declspec
(
dllimport
)
void
__stdcall
Sleep
(
unsigned
long
dwMilliseconds
);
// # include <windows.h>
...
...
@@ -40,9 +46,23 @@ __declspec(dllimport) void __stdcall Sleep(unsigned long dwMilliseconds);
# define lseek(f,p,w) _lseeki64((f), (p), (w))
#endif
/* XXX: check for Winsock here */
#if 0
#define HAVE_CLOSESOCKET 1
#endif
#ifdef __BEOS__
# ifndef usleep
# include <sys/socket.h>
# include <netinet/in.h>
/* not net_server ? */
# if IPPROTO_TCP != 6
# define HAVE_CLOSESOCKET 1
# endif
# include <BeBuild.h>
/* R5 didn't have usleep, fake it. Haiku and Zeta has it now. */
# if B_BEOS_VERSION <= B_BEOS_VERSION_5
# include <OS.h>
/* doesn't set errno but that's enough */
# define usleep(t) snooze((bigtime_t)(t))
# endif
#endif
...
...
@@ -53,4 +73,9 @@ static inline int usleep(unsigned int t) { return _sleep2(t / 1000); }
static
inline
int
strcasecmp
(
const
char
*
s1
,
const
char
*
s2
)
{
return
stricmp
(
s1
,
s2
);
}
#endif
/* most of the time closing a socket is just closing an fd */
#if HAVE_CLOSESOCKET != 1
#define closesocket close
#endif
#endif
/* _OS_SUPPORT_H */
libavformat/rtp.c
浏览文件 @
e9d511dc
...
...
@@ -26,11 +26,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#ifndef __BEOS__
# include <arpa/inet.h>
#else
# include "barpainet.h"
#endif
#include <arpa/inet.h>
#include <netdb.h>
#include "rtp_internal.h"
...
...
libavformat/rtp_h264.c
浏览文件 @
e9d511dc
...
...
@@ -45,11 +45,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <assert.h>
#ifndef __BEOS__
# include <arpa/inet.h>
#else
# include "barpainet.h"
#endif
#include <arpa/inet.h>
#include <netdb.h>
#include "rtp_internal.h"
...
...
libavformat/rtpproto.c
浏览文件 @
e9d511dc
...
...
@@ -25,11 +25,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#ifndef __BEOS__
# include <arpa/inet.h>
#else
# include "barpainet.h"
#endif
#include <arpa/inet.h>
#include <netdb.h>
#include <fcntl.h>
...
...
libavformat/rtsp.c
浏览文件 @
e9d511dc
...
...
@@ -24,11 +24,7 @@
#include <sys/time.h>
#include <netinet/in.h>
#include <sys/socket.h>
#ifndef __BEOS__
# include <arpa/inet.h>
#else
# include "barpainet.h"
#endif
#include <arpa/inet.h>
#include "rtp_internal.h"
...
...
libavformat/tcp.c
浏览文件 @
e9d511dc
...
...
@@ -23,14 +23,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#if defined(__BEOS__) || defined(__INNOTEK_LIBC__)
typedef
int
socklen_t
;
#endif
#ifndef __BEOS__
# include <arpa/inet.h>
#else
# include "barpainet.h"
#endif
#include <netdb.h>
#include <sys/time.h>
#include <fcntl.h>
...
...
@@ -127,7 +120,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
ret
=
AVERROR_IO
;
fail1:
if
(
fd
>=
0
)
close
(
fd
);
close
socket
(
fd
);
av_free
(
s
);
return
ret
;
}
...
...
@@ -213,11 +206,7 @@ static int tcp_write(URLContext *h, uint8_t *buf, int size)
static
int
tcp_close
(
URLContext
*
h
)
{
TCPContext
*
s
=
h
->
priv_data
;
#ifdef CONFIG_BEOS_NETSERVER
closesocket
(
s
->
fd
);
#else
close
(
s
->
fd
);
#endif
av_free
(
s
);
return
0
;
}
...
...
libavformat/udp.c
浏览文件 @
e9d511dc
...
...
@@ -23,11 +23,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#ifndef __BEOS__
# include <arpa/inet.h>
#else
# include "barpainet.h"
#endif
#include <netdb.h>
#ifndef IPV6_ADD_MEMBERSHIP
...
...
@@ -214,11 +210,7 @@ static int udp_ipv6_set_local(URLContext *h) {
fail:
if
(
udp_fd
>=
0
)
#ifdef CONFIG_BEOS_NETSERVER
closesocket
(
udp_fd
);
#else
close
(
udp_fd
);
#endif
if
(
res0
)
freeaddrinfo
(
res0
);
return
-
1
;
...
...
@@ -421,11 +413,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)
return
0
;
fail:
if
(
udp_fd
>=
0
)
#ifdef CONFIG_BEOS_NETSERVER
closesocket
(
udp_fd
);
#else
close
(
udp_fd
);
#endif
av_free
(
s
);
return
AVERROR_IO
;
}
...
...
@@ -482,22 +470,20 @@ static int udp_close(URLContext *h)
{
UDPContext
*
s
=
h
->
priv_data
;
#ifndef CONFIG_BEOS_NETSERVER
#ifndef CONFIG_IPV6
#ifdef IP_DROP_MEMBERSHIP
if
(
s
->
is_multicast
&&
!
(
h
->
flags
&
URL_WRONLY
))
{
if
(
setsockopt
(
s
->
udp_fd
,
IPPROTO_IP
,
IP_DROP_MEMBERSHIP
,
&
s
->
mreq
,
sizeof
(
s
->
mreq
))
<
0
)
{
perror
(
"IP_DROP_MEMBERSHIP"
);
}
}
#endif
#else
if
(
s
->
is_multicast
&&
!
(
h
->
flags
&
URL_WRONLY
))
udp_ipv6_leave_multicast_group
(
s
->
udp_fd
,
(
struct
sockaddr
*
)
&
s
->
dest_addr
);
#endif
close
(
s
->
udp_fd
);
#else
closesocket
(
s
->
udp_fd
);
#endif
av_free
(
s
);
return
0
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录