Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
3a1f102a
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,发现更多精彩内容 >>
提交
3a1f102a
编写于
10月 17, 2015
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
projects: Update for recent upstream merge.
上级
10d8f600
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
37 addition
and
0 deletion
+37
-0
SMP/config.asm
SMP/config.asm
+6
-0
SMP/config.h
SMP/config.h
+6
-0
SMP/libavcodec.vcxproj
SMP/libavcodec.vcxproj
+2
-0
SMP/libavcodec.vcxproj.filters
SMP/libavcodec.vcxproj.filters
+3
-0
SMP/libavformat.vcxproj
SMP/libavformat.vcxproj
+8
-0
SMP/libavformat.vcxproj.filters
SMP/libavformat.vcxproj.filters
+12
-0
未找到文件。
SMP/config.asm
浏览文件 @
3a1f102a
...
...
@@ -383,6 +383,7 @@
%define HAVE_DOS_PATHS 1
%define HAVE_DXVA2API_COBJ 1
%define HAVE_DXVA2_LIB 1
%define HAVE_WINRT 0
%define HAVE_LIBC_MSVCRT 1
%define HAVE_LIBDC1394_1 0
%define HAVE_LIBDC1394_2 0
...
...
@@ -1020,6 +1021,7 @@
%define CONFIG_ADPCM_IMA_WAV_DECODER 1
%define CONFIG_ADPCM_IMA_WS_DECODER 1
%define CONFIG_ADPCM_MS_DECODER 1
%define CONFIG_ADPCM_PSX_DECODER 1
%define CONFIG_ADPCM_SBPRO_2_DECODER 1
%define CONFIG_ADPCM_SBPRO_3_DECODER 1
%define CONFIG_ADPCM_SBPRO_4_DECODER 1
...
...
@@ -1078,6 +1080,7 @@
%define CONFIG_ACT_DEMUXER 1
%define CONFIG_ADF_DEMUXER 1
%define CONFIG_ADP_DEMUXER 1
%define CONFIG_ADS_DEMUXER 1
%define CONFIG_ADX_DEMUXER 1
%define CONFIG_AEA_DEMUXER 1
%define CONFIG_AFC_DEMUXER 1
...
...
@@ -1142,6 +1145,7 @@
%define CONFIG_G722_DEMUXER 1
%define CONFIG_G723_1_DEMUXER 1
%define CONFIG_G729_DEMUXER 1
%define CONFIG_GENH_DEMUXER 1
%define CONFIG_GIF_DEMUXER 1
%define CONFIG_GSM_DEMUXER 1
%define CONFIG_GXF_DEMUXER 1
...
...
@@ -1265,6 +1269,7 @@
%define CONFIG_SUBVIEWER1_DEMUXER 1
%define CONFIG_SUBVIEWER_DEMUXER 1
%define CONFIG_SUP_DEMUXER 1
%define CONFIG_SVAG_DEMUXER 1
%define CONFIG_SWF_DEMUXER 1
%define CONFIG_TAK_DEMUXER 1
%define CONFIG_TEDCAPTIONS_DEMUXER 1
...
...
@@ -1275,6 +1280,7 @@
%define CONFIG_TTA_DEMUXER 1
%define CONFIG_TXD_DEMUXER 1
%define CONFIG_TTY_DEMUXER 1
%define CONFIG_VAG_DEMUXER 1
%define CONFIG_VC1_DEMUXER 1
%define CONFIG_VC1T_DEMUXER 1
%define CONFIG_VIVO_DEMUXER 1
...
...
SMP/config.h
浏览文件 @
3a1f102a
...
...
@@ -425,6 +425,7 @@
#define HAVE_DOS_PATHS 1
#define HAVE_DXVA2API_COBJ 1
#define HAVE_DXVA2_LIB 1
#define HAVE_WINRT 0
#define HAVE_LIBC_MSVCRT 1
#define HAVE_LIBDC1394_1 0
#define HAVE_LIBDC1394_2 0
...
...
@@ -1070,6 +1071,7 @@
#define CONFIG_ADPCM_IMA_WAV_DECODER 1
#define CONFIG_ADPCM_IMA_WS_DECODER 1
#define CONFIG_ADPCM_MS_DECODER 1
#define CONFIG_ADPCM_PSX_DECODER 1
#define CONFIG_ADPCM_SBPRO_2_DECODER 1
#define CONFIG_ADPCM_SBPRO_3_DECODER 1
#define CONFIG_ADPCM_SBPRO_4_DECODER 1
...
...
@@ -1128,6 +1130,7 @@
#define CONFIG_ACT_DEMUXER 1
#define CONFIG_ADF_DEMUXER 1
#define CONFIG_ADP_DEMUXER 1
#define CONFIG_ADS_DEMUXER 1
#define CONFIG_ADX_DEMUXER 1
#define CONFIG_AEA_DEMUXER 1
#define CONFIG_AFC_DEMUXER 1
...
...
@@ -1192,6 +1195,7 @@
#define CONFIG_G722_DEMUXER 1
#define CONFIG_G723_1_DEMUXER 1
#define CONFIG_G729_DEMUXER 1
#define CONFIG_GENH_DEMUXER 1
#define CONFIG_GIF_DEMUXER 1
#define CONFIG_GSM_DEMUXER 1
#define CONFIG_GXF_DEMUXER 1
...
...
@@ -1315,6 +1319,7 @@
#define CONFIG_SUBVIEWER1_DEMUXER 1
#define CONFIG_SUBVIEWER_DEMUXER 1
#define CONFIG_SUP_DEMUXER 1
#define CONFIG_SVAG_DEMUXER 1
#define CONFIG_SWF_DEMUXER 1
#define CONFIG_TAK_DEMUXER 1
#define CONFIG_TEDCAPTIONS_DEMUXER 1
...
...
@@ -1325,6 +1330,7 @@
#define CONFIG_TTA_DEMUXER 1
#define CONFIG_TXD_DEMUXER 1
#define CONFIG_TTY_DEMUXER 1
#define CONFIG_VAG_DEMUXER 1
#define CONFIG_VC1_DEMUXER 1
#define CONFIG_VC1T_DEMUXER 1
#define CONFIG_VIVO_DEMUXER 1
...
...
SMP/libavcodec.vcxproj
浏览文件 @
3a1f102a
...
...
@@ -445,6 +445,8 @@
</ClCompile>
<ClCompile
Include=
"..\libavcodec\aacenc_tns.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\aacenc_ltp.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\aacenc_pred.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\psymodel.c"
>
...
...
SMP/libavcodec.vcxproj.filters
浏览文件 @
3a1f102a
...
...
@@ -683,6 +683,9 @@
<ClCompile
Include=
"..\libavcodec\aacenc_tns.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\aacenc_ltp.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\aacenc_pred.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
SMP/libavformat.vcxproj
浏览文件 @
3a1f102a
...
...
@@ -183,6 +183,8 @@
</ClCompile>
<ClCompile
Include=
"..\libavformat\adp.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\ads.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\adxdec.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\adtsenc.c"
>
...
...
@@ -397,6 +399,8 @@
</ClCompile>
<ClCompile
Include=
"..\libavformat\g729dec.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\genh.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\h261dec.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\h263dec.c"
>
...
...
@@ -729,6 +733,8 @@
</ClCompile>
<ClCompile
Include=
"..\libavformat\supdec.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\svag.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\swfdec.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\takdec.c"
>
...
...
@@ -753,6 +759,8 @@
</ClCompile>
<ClCompile
Include=
"..\libavformat\uncodedframecrcenc.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\vag.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\vc1dec.c"
>
</ClCompile>
<ClCompile
Include=
"..\libavformat\vc1test.c"
>
...
...
SMP/libavformat.vcxproj.filters
浏览文件 @
3a1f102a
...
...
@@ -204,6 +204,9 @@
<ClCompile
Include=
"..\libavformat\adp.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\ads.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\adxdec.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
...
...
@@ -525,6 +528,9 @@
<ClCompile
Include=
"..\libavformat\g729dec.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\genh.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\h261dec.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
...
...
@@ -1023,6 +1029,9 @@
<ClCompile
Include=
"..\libavformat\supdec.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\svag.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\swfdec.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
...
...
@@ -1059,6 +1068,9 @@
<ClCompile
Include=
"..\libavformat\uncodedframecrcenc.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\vag.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\vc1dec.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录