Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
183baead
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,发现更多精彩内容 >>
提交
183baead
编写于
2月 06, 2011
作者:
M
Martin Storsjö
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avformat: Add the https protocol
Signed-off-by:
N
Martin Storsjö
<
martin@martin.st
>
上级
558d192d
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
30 addition
and
5 deletion
+30
-5
Changelog
Changelog
+1
-0
configure
configure
+1
-0
libavformat/Makefile
libavformat/Makefile
+1
-0
libavformat/allformats.c
libavformat/allformats.c
+1
-0
libavformat/http.c
libavformat/http.c
+25
-4
libavformat/version.h
libavformat/version.h
+1
-1
未找到文件。
Changelog
浏览文件 @
183baead
...
...
@@ -57,6 +57,7 @@ easier to use. The changes are:
- 4:2:2 H.264 decoding support
- Pulseaudio input device
- replacement Indeo 3 decoder
- TLS/SSL and HTTPS protocol support
version 0.7:
...
...
configure
浏览文件 @
183baead
...
...
@@ -1478,6 +1478,7 @@ x11_grab_device_indev_extralibs="-lX11 -lXext -lXfixes"
gopher_protocol_deps
=
"network"
http_protocol_deps
=
"network"
http_protocol_select
=
"tcp_protocol"
https_protocol_select
=
"tls_protocol"
mmsh_protocol_select
=
"http_protocol"
mmst_protocol_deps
=
"network"
rtmp_protocol_select
=
"tcp_protocol"
...
...
libavformat/Makefile
浏览文件 @
183baead
...
...
@@ -322,6 +322,7 @@ OBJS-$(CONFIG_CRYPTO_PROTOCOL) += crypto.o
OBJS-$(CONFIG_FILE_PROTOCOL)
+=
file.o
OBJS-$(CONFIG_GOPHER_PROTOCOL)
+=
gopher.o
OBJS-$(CONFIG_HTTP_PROTOCOL)
+=
http.o httpauth.o
OBJS-$(CONFIG_HTTPS_PROTOCOL)
+=
http.o httpauth.o
OBJS-$(CONFIG_MMSH_PROTOCOL)
+=
mmsh.o mms.o asf.o
OBJS-$(CONFIG_MMST_PROTOCOL)
+=
mmst.o mms.o asf.o
OBJS-$(CONFIG_MD5_PROTOCOL)
+=
md5proto.o
...
...
libavformat/allformats.c
浏览文件 @
183baead
...
...
@@ -241,6 +241,7 @@ void av_register_all(void)
REGISTER_PROTOCOL
(
FILE
,
file
);
REGISTER_PROTOCOL
(
GOPHER
,
gopher
);
REGISTER_PROTOCOL
(
HTTP
,
http
);
REGISTER_PROTOCOL
(
HTTPS
,
https
);
REGISTER_PROTOCOL
(
MMSH
,
mmsh
);
REGISTER_PROTOCOL
(
MMST
,
mmst
);
REGISTER_PROTOCOL
(
MD5
,
md5
);
...
...
libavformat/http.c
浏览文件 @
183baead
...
...
@@ -92,8 +92,8 @@ void ff_http_init_auth_state(URLContext *dest, const URLContext *src)
/* return non zero if error */
static
int
http_open_cnx
(
URLContext
*
h
)
{
const
char
*
path
,
*
proxy_path
;
char
hostname
[
1024
],
hoststr
[
1024
];
const
char
*
path
,
*
proxy_path
,
*
lower_proto
=
"tcp"
;
char
hostname
[
1024
],
hoststr
[
1024
]
,
proto
[
10
]
;
char
auth
[
1024
];
char
path1
[
1024
];
char
buf
[
1024
];
...
...
@@ -109,7 +109,8 @@ static int http_open_cnx(URLContext *h)
/* fill the dest addr */
redo:
/* needed in any case to build the host string */
av_url_split
(
NULL
,
0
,
auth
,
sizeof
(
auth
),
hostname
,
sizeof
(
hostname
),
&
port
,
av_url_split
(
proto
,
sizeof
(
proto
),
auth
,
sizeof
(
auth
),
hostname
,
sizeof
(
hostname
),
&
port
,
path1
,
sizeof
(
path1
),
s
->
location
);
ff_url_join
(
hoststr
,
sizeof
(
hoststr
),
NULL
,
NULL
,
hostname
,
port
,
NULL
);
...
...
@@ -123,10 +124,15 @@ static int http_open_cnx(URLContext *h)
else
path
=
path1
;
}
if
(
!
strcmp
(
proto
,
"https"
))
{
lower_proto
=
"tls"
;
if
(
port
<
0
)
port
=
443
;
}
if
(
port
<
0
)
port
=
80
;
ff_url_join
(
buf
,
sizeof
(
buf
),
"tcp"
,
NULL
,
hostname
,
port
,
NULL
);
ff_url_join
(
buf
,
sizeof
(
buf
),
lower_proto
,
NULL
,
hostname
,
port
,
NULL
);
err
=
ffurl_open
(
&
hd
,
buf
,
AVIO_FLAG_READ_WRITE
);
if
(
err
<
0
)
goto
fail
;
...
...
@@ -509,6 +515,7 @@ http_get_file_handle(URLContext *h)
return
ffurl_get_file_handle
(
s
->
hd
);
}
#if CONFIG_HTTP_PROTOCOL
URLProtocol
ff_http_protocol
=
{
.
name
=
"http"
,
.
url_open
=
http_open
,
...
...
@@ -520,3 +527,17 @@ URLProtocol ff_http_protocol = {
.
priv_data_size
=
sizeof
(
HTTPContext
),
.
priv_data_class
=
&
httpcontext_class
,
};
#endif
#if CONFIG_HTTPS_PROTOCOL
URLProtocol
ff_https_protocol
=
{
.
name
=
"https"
,
.
url_open
=
http_open
,
.
url_read
=
http_read
,
.
url_write
=
http_write
,
.
url_seek
=
http_seek
,
.
url_close
=
http_close
,
.
url_get_file_handle
=
http_get_file_handle
,
.
priv_data_size
=
sizeof
(
HTTPContext
),
.
priv_data_class
=
&
httpcontext_class
,
};
#endif
libavformat/version.h
浏览文件 @
183baead
...
...
@@ -24,7 +24,7 @@
#include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 53
#define LIBAVFORMAT_VERSION_MINOR 1
1
#define LIBAVFORMAT_VERSION_MINOR 1
2
#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录