Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
bb47046e
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,发现更多精彩内容 >>
提交
bb47046e
编写于
11月 20, 2016
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
projects: Update for recent upstream merge.
上级
7098a925
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
29 addition
and
15 deletion
+29
-15
SMP/config.asm
SMP/config.asm
+2
-0
SMP/config.h
SMP/config.h
+2
-0
SMP/libavcodec.vcxproj
SMP/libavcodec.vcxproj
+4
-3
SMP/libavcodec.vcxproj.filters
SMP/libavcodec.vcxproj.filters
+12
-9
SMP/libavformat.def
SMP/libavformat.def
+1
-0
SMP/libavformat.vcxproj
SMP/libavformat.vcxproj
+2
-1
SMP/libavformat.vcxproj.filters
SMP/libavformat.vcxproj.filters
+5
-2
SMP/libavformat/protocol_list.c
SMP/libavformat/protocol_list.c
+1
-0
未找到文件。
SMP/config.asm
浏览文件 @
bb47046e
...
...
@@ -621,6 +621,7 @@
%define CONFIG_H263DSP 1
%define CONFIG_H264CHROMA 1
%define CONFIG_H264DSP 1
%define CONFIG_H264PARSE 1
%define CONFIG_H264PRED 1
%define CONFIG_H264QPEL 1
%define CONFIG_HPELDSP 1
...
...
@@ -2226,6 +2227,7 @@
%define CONFIG_MMST_PROTOCOL 1
%define CONFIG_MD5_PROTOCOL 1
%define CONFIG_PIPE_PROTOCOL 1
%define CONFIG_PROMPEG_PROTOCOL 1
%define CONFIG_RTMP_PROTOCOL 1
%define CONFIG_RTMPE_PROTOCOL 1
%define CONFIG_RTMPS_PROTOCOL 1
...
...
SMP/config.h
浏览文件 @
bb47046e
...
...
@@ -671,6 +671,7 @@
#define CONFIG_H263DSP 1
#define CONFIG_H264CHROMA 1
#define CONFIG_H264DSP 1
#define CONFIG_H264PARSE 1
#define CONFIG_H264PRED 1
#define CONFIG_H264QPEL 1
#define CONFIG_HPELDSP 1
...
...
@@ -2286,6 +2287,7 @@
#define CONFIG_MMST_PROTOCOL 1
#define CONFIG_MD5_PROTOCOL 1
#define CONFIG_PIPE_PROTOCOL 1
#define CONFIG_PROMPEG_PROTOCOL 1
#define CONFIG_RTMP_PROTOCOL 1
#define CONFIG_RTMPE_PROTOCOL 1
#define CONFIG_RTMPS_PROTOCOL 1
...
...
SMP/libavcodec.vcxproj
浏览文件 @
bb47046e
...
...
@@ -169,6 +169,7 @@
<ClCompile
Include=
"..\libavcodec\jni.c"
/>
<ClCompile
Include=
"..\libavcodec\mathtables.c"
/>
<ClCompile
Include=
"..\libavcodec\mediacodec.c"
/>
<ClCompile
Include=
"..\libavcodec\mpeg12framerate.c"
/>
<ClCompile
Include=
"..\libavcodec\options.c"
/>
<ClCompile
Include=
"..\libavcodec\parser.c"
/>
<ClCompile
Include=
"..\libavcodec\profiles.c"
/>
...
...
@@ -203,6 +204,9 @@
<ClCompile
Include=
"..\libavcodec\h264chroma.c"
/>
<ClCompile
Include=
"..\libavcodec\h264dsp.c"
/>
<ClCompile
Include=
"..\libavcodec\h264idct.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_parse.c"
/>
<ClCompile
Include=
"..\libavcodec\h2645_parse.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_ps.c"
/>
<ClCompile
Include=
"..\libavcodec\h264pred.c"
/>
<ClCompile
Include=
"..\libavcodec\h264qpel.c"
/>
<ClCompile
Include=
"..\libavcodec\huffman.c"
/>
...
...
@@ -481,13 +485,10 @@
<ClCompile
Include=
"..\libavcodec\h264_loopfilter.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_mb.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_picture.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_ps.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_refs.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_sei.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_slice.c"
/>
<ClCompile
Include=
"..\libavcodec\h264data.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_parse.c"
/>
<ClCompile
Include=
"..\libavcodec\h2645_parse.c"
/>
<ClCompile
Include=
"..\libavcodec\nvenc_h264.c"
/>
<ClCompile
Include=
"..\libavcodec\qsvdec_h2645.c"
/>
<ClCompile
Include=
"..\libavcodec\qsvenc_h264.c"
/>
...
...
SMP/libavcodec.vcxproj.filters
浏览文件 @
bb47046e
...
...
@@ -330,6 +330,9 @@
<ClCompile
Include=
"..\libavcodec\mediacodec.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\mpeg12framerate.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\options.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
@@ -432,6 +435,15 @@
<ClCompile
Include=
"..\libavcodec\h264idct.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\h264_parse.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\h2645_parse.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\h264_ps.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\h264pred.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
@@ -1266,9 +1278,6 @@
<ClCompile
Include=
"..\libavcodec\h264_picture.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\h264_ps.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\h264_refs.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
@@ -1281,12 +1290,6 @@
<ClCompile
Include=
"..\libavcodec\h264data.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\h264_parse.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\h2645_parse.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\nvenc_h264.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
SMP/libavformat.def
浏览文件 @
bb47046e
...
...
@@ -66,6 +66,7 @@ EXPORTS
av_register_output_format
av_sdp_create
av_seek_frame
av_stream_add_side_data
av_stream_get_codec_timebase
av_stream_get_end_pts
av_stream_get_parser
...
...
SMP/libavformat.vcxproj
浏览文件 @
bb47046e
...
...
@@ -309,8 +309,8 @@
<ClCompile
Include=
"..\libavformat\vpcc.c"
/>
<ClCompile
Include=
"..\libavformat\movenchint.c"
/>
<ClCompile
Include=
"..\libavformat\movenccenc.c"
/>
<ClCompile
Include=
"..\libavformat\mp3enc.c"
/>
<ClCompile
Include=
"..\libavformat\mp3dec.c"
/>
<ClCompile
Include=
"..\libavformat\mp3enc.c"
/>
<ClCompile
Include=
"..\libavformat\mpc.c"
/>
<ClCompile
Include=
"..\libavformat\mpc8.c"
/>
<ClCompile
Include=
"..\libavformat\mpegenc.c"
/>
...
...
@@ -496,6 +496,7 @@
<ClCompile
Include=
"..\libavformat\mmsh.c"
/>
<ClCompile
Include=
"..\libavformat\mms.c"
/>
<ClCompile
Include=
"..\libavformat\mmst.c"
/>
<ClCompile
Include=
"..\libavformat\prompeg.c"
/>
<ClCompile
Include=
"..\libavformat\rtmpproto.c"
/>
<ClCompile
Include=
"..\libavformat\rtmppkt.c"
/>
<ClCompile
Include=
"..\libavformat\rtpproto.c"
/>
...
...
SMP/libavformat.vcxproj.filters
浏览文件 @
bb47046e
...
...
@@ -751,10 +751,10 @@
<ClCompile
Include=
"..\libavformat\movenccenc.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\mp3
en
c.c"
>
<ClCompile
Include=
"..\libavformat\mp3
de
c.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\mp3
de
c.c"
>
<ClCompile
Include=
"..\libavformat\mp3
en
c.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\mpc.c"
>
...
...
@@ -1312,6 +1312,9 @@
<ClCompile
Include=
"..\libavformat\mmst.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\prompeg.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\rtmpproto.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
...
...
SMP/libavformat/protocol_list.c
浏览文件 @
bb47046e
...
...
@@ -39,6 +39,7 @@ static const URLProtocol *url_protocols[] = {
&
ff_mmst_protocol
,
&
ff_md5_protocol
,
&
ff_pipe_protocol
,
&
ff_prompeg_protocol
,
&
ff_rtmp_protocol
,
&
ff_rtmpe_protocol
,
&
ff_rtmps_protocol
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录