Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
f495ad24
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,体验更适合开发者的 AI 搜索 >>
提交
f495ad24
编写于
9月 04, 2016
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
projects: Update for recent upstream merge.
上级
643603ac
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
14 addition
and
8 deletion
+14
-8
SMP/config.asm
SMP/config.asm
+3
-1
SMP/config.h
SMP/config.h
+3
-1
SMP/libavfilter.vcxproj
SMP/libavfilter.vcxproj
+1
-0
SMP/libavfilter.vcxproj.filters
SMP/libavfilter.vcxproj.filters
+3
-0
SMP/libavformat.vcxproj
SMP/libavformat.vcxproj
+1
-0
SMP/libavformat.vcxproj.filters
SMP/libavformat.vcxproj.filters
+3
-0
SMP/readme.txt
SMP/readme.txt
+0
-6
未找到文件。
SMP/config.asm
浏览文件 @
f495ad24
...
...
@@ -332,6 +332,7 @@
%define HAVE_ISATTY 1
%define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
%define HAVE_KBHIT 1
%define HAVE_LOADLIBRARY 1
%define HAVE_LOCALTIME_R 0
%define HAVE_LSTAT 0
%define HAVE_LZO1X_999_COMPRESS 0
...
...
@@ -1874,6 +1875,7 @@
%define CONFIG_VSTACK_FILTER 1
%define CONFIG_W3FDIF_FILTER 1
%define CONFIG_WAVEFORM_FILTER 1
%define CONFIG_WEAVE_FILTER 1
%define CONFIG_XBR_FILTER 1
%define CONFIG_YADIF_FILTER 1
%define CONFIG_ZMQ_FILTER 0
...
...
@@ -2012,7 +2014,7 @@
%define CONFIG_F4V_MUXER 1
%define CONFIG_FFM_MUXER 1
%define CONFIG_FFMETADATA_MUXER 1
%define CONFIG_FIFO_MUXER
0
%define CONFIG_FIFO_MUXER
1
%define CONFIG_FILMSTRIP_MUXER 1
%define CONFIG_FLAC_MUXER 1
%define CONFIG_FLV_MUXER 1
...
...
SMP/config.h
浏览文件 @
f495ad24
...
...
@@ -362,6 +362,7 @@
#define HAVE_ISATTY 1
#define HAVE_JACK_PORT_GET_LATENCY_RANGE 0
#define HAVE_KBHIT 1
#define HAVE_LOADLIBRARY 1
#define HAVE_LOCALTIME_R 0
#define HAVE_LSTAT 0
#define HAVE_LZO1X_999_COMPRESS 0
...
...
@@ -1924,6 +1925,7 @@
#define CONFIG_VSTACK_FILTER 1
#define CONFIG_W3FDIF_FILTER 1
#define CONFIG_WAVEFORM_FILTER 1
#define CONFIG_WEAVE_FILTER 1
#define CONFIG_XBR_FILTER 1
#define CONFIG_YADIF_FILTER 1
#define CONFIG_ZMQ_FILTER 0
...
...
@@ -2072,7 +2074,7 @@
#define CONFIG_F4V_MUXER 1
#define CONFIG_FFM_MUXER 1
#define CONFIG_FFMETADATA_MUXER 1
#define CONFIG_FIFO_MUXER
0
#define CONFIG_FIFO_MUXER
1
#define CONFIG_FILMSTRIP_MUXER 1
#define CONFIG_FLAC_MUXER 1
#define CONFIG_FLV_MUXER 1
...
...
SMP/libavfilter.vcxproj
浏览文件 @
f495ad24
...
...
@@ -304,6 +304,7 @@
<ClCompile
Include=
"..\libavfilter\vf_vflip.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_vignette.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_waveform.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_weave.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_xbr.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_zoompan.c"
/>
<ClCompile
Include=
"..\libavfilter\vsrc_testsrc.c"
/>
...
...
SMP/libavfilter.vcxproj.filters
浏览文件 @
f495ad24
...
...
@@ -732,6 +732,9 @@
<ClCompile
Include=
"..\libavfilter\vf_waveform.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_weave.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_xbr.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
SMP/libavformat.vcxproj
浏览文件 @
f495ad24
...
...
@@ -221,6 +221,7 @@
<ClCompile
Include=
"..\libavformat\ffmenc.c"
/>
<ClCompile
Include=
"..\libavformat\ffmetadec.c"
/>
<ClCompile
Include=
"..\libavformat\ffmetaenc.c"
/>
<ClCompile
Include=
"..\libavformat\fifo.c"
/>
<ClCompile
Include=
"..\libavformat\filmstripdec.c"
/>
<ClCompile
Include=
"..\libavformat\filmstripenc.c"
/>
<ClCompile
Include=
"..\libavformat\flacdec.c"
/>
...
...
SMP/libavformat.vcxproj.filters
浏览文件 @
f495ad24
...
...
@@ -484,6 +484,9 @@
<ClCompile
Include=
"..\libavformat\ffmetaenc.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\fifo.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\filmstripdec.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
...
...
SMP/readme.txt
浏览文件 @
f495ad24
...
...
@@ -57,12 +57,6 @@ However the following is a list of extra dependency options that require externa
1) opengl (requires glext)
a) Download glext.h and wglext.h from opengl.org.
b) Save the header files into OutputDir/include/gl/*.
2) nvenc (requires NVIDIA Video Codec SDK, recommended to also enable cuda)
a) Enable cuda as above.
b) Download the "NVIDIA Video Codec SDK" from the NVIDIA website.
c) Copy 'nvEncodeAPI.h' from the "NVIDIA Video Codec SDK" into the installed %CUDA%/include folder
(where %CUDA% is the location that the CUDA SDK was installed) or into OutputDir/include if CUDA
is not available.
*OutputDir is the "Output Directory" specified in the project properties.
The default value of OutputDir is "..\..\msvc" relative to the FFmpeg source directory. An example of the expected
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录