Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
5e791e35
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,发现更多精彩内容 >>
提交
5e791e35
编写于
8月 21, 2016
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
projects: Update for recent upstream merge.
上级
a7937ec6
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
63 addition
and
41 deletion
+63
-41
SMP/config.asm
SMP/config.asm
+11
-6
SMP/config.h
SMP/config.h
+11
-6
SMP/libavcodec.def
SMP/libavcodec.def
+7
-0
SMP/libavfilter.vcxproj
SMP/libavfilter.vcxproj
+9
-8
SMP/libavfilter.vcxproj.filters
SMP/libavfilter.vcxproj.filters
+24
-21
SMP/libavutil.def
SMP/libavutil.def
+1
-0
未找到文件。
SMP/config.asm
浏览文件 @
5e791e35
...
...
@@ -1034,6 +1034,8 @@
%define CONFIG_PCM_S32BE_DECODER 1
%define CONFIG_PCM_S32LE_DECODER 1
%define CONFIG_PCM_S32LE_PLANAR_DECODER 1
%define CONFIG_PCM_S64BE_DECODER 1
%define CONFIG_PCM_S64LE_DECODER 1
%define CONFIG_PCM_U8_DECODER 1
%define CONFIG_PCM_U16BE_DECODER 1
%define CONFIG_PCM_U16LE_DECODER 1
...
...
@@ -1534,6 +1536,8 @@
%define CONFIG_PCM_S32BE_ENCODER 1
%define CONFIG_PCM_S32LE_ENCODER 1
%define CONFIG_PCM_S32LE_PLANAR_ENCODER 1
%define CONFIG_PCM_S64BE_ENCODER 1
%define CONFIG_PCM_S64LE_ENCODER 1
%define CONFIG_PCM_U8_ENCODER 1
%define CONFIG_PCM_U16BE_ENCODER 1
%define CONFIG_PCM_U16LE_ENCODER 1
...
...
@@ -1698,10 +1702,11 @@
%define CONFIG_ANULLSINK_FILTER 1
%define CONFIG_ALPHAEXTRACT_FILTER 1
%define CONFIG_ALPHAMERGE_FILTER 1
%define CONFIG_ATADENOISE_FILTER 1
%define CONFIG_ASS_FILTER 1
%define CONFIG_
BENCH
_FILTER 1
%define CONFIG_
ATADENOISE
_FILTER 1
%define CONFIG_BBOX_FILTER 1
%define CONFIG_BENCH_FILTER 1
%define CONFIG_BITPLANENOISE_FILTER 1
%define CONFIG_BLACKDETECT_FILTER 1
%define CONFIG_BLACKFRAME_FILTER 1
%define CONFIG_BLEND_FILTER 1
...
...
@@ -1765,11 +1770,11 @@
%define CONFIG_HISTOGRAM_FILTER 1
%define CONFIG_HQDN3D_FILTER 1
%define CONFIG_HQX_FILTER 1
%define CONFIG_HSTACK_FILTER 1
%define CONFIG_HUE_FILTER 1
%define CONFIG_HWDOWNLOAD_FILTER 1
%define CONFIG_HWUPLOAD_FILTER 1
%define CONFIG_HWUPLOAD_CUDA_FILTER 0
%define CONFIG_HSTACK_FILTER 1
%define CONFIG_HUE_FILTER 1
%define CONFIG_IDET_FILTER 1
%define CONFIG_IL_FILTER 1
%define CONFIG_INFLATE_FILTER 1
...
...
@@ -1778,8 +1783,8 @@
%define CONFIG_KERNDEINT_FILTER 1
%define CONFIG_LENSCORRECTION_FILTER 1
%define CONFIG_LOOP_FILTER 1
%define CONFIG_LUT3D_FILTER 1
%define CONFIG_LUT_FILTER 1
%define CONFIG_LUT3D_FILTER 1
%define CONFIG_LUTRGB_FILTER 1
%define CONFIG_LUTYUV_FILTER 1
%define CONFIG_MASKEDMERGE_FILTER 1
...
...
@@ -1819,9 +1824,9 @@
%define CONFIG_ROTATE_FILTER 1
%define CONFIG_SAB_FILTER 1
%define CONFIG_SCALE_FILTER 1
%define CONFIG_SCALE2REF_FILTER 1
%define CONFIG_SCALE_NPP_FILTER 0
%define CONFIG_SCALE_VAAPI_FILTER 0
%define CONFIG_SCALE2REF_FILTER 1
%define CONFIG_SELECT_FILTER 1
%define CONFIG_SELECTIVECOLOR_FILTER 1
%define CONFIG_SENDCMD_FILTER 1
...
...
SMP/config.h
浏览文件 @
5e791e35
...
...
@@ -1084,6 +1084,8 @@
#define CONFIG_PCM_S32BE_DECODER 1
#define CONFIG_PCM_S32LE_DECODER 1
#define CONFIG_PCM_S32LE_PLANAR_DECODER 1
#define CONFIG_PCM_S64BE_DECODER 1
#define CONFIG_PCM_S64LE_DECODER 1
#define CONFIG_PCM_U8_DECODER 1
#define CONFIG_PCM_U16BE_DECODER 1
#define CONFIG_PCM_U16LE_DECODER 1
...
...
@@ -1584,6 +1586,8 @@
#define CONFIG_PCM_S32BE_ENCODER 1
#define CONFIG_PCM_S32LE_ENCODER 1
#define CONFIG_PCM_S32LE_PLANAR_ENCODER 1
#define CONFIG_PCM_S64BE_ENCODER 1
#define CONFIG_PCM_S64LE_ENCODER 1
#define CONFIG_PCM_U8_ENCODER 1
#define CONFIG_PCM_U16BE_ENCODER 1
#define CONFIG_PCM_U16LE_ENCODER 1
...
...
@@ -1748,10 +1752,11 @@
#define CONFIG_ANULLSINK_FILTER 1
#define CONFIG_ALPHAEXTRACT_FILTER 1
#define CONFIG_ALPHAMERGE_FILTER 1
#define CONFIG_ATADENOISE_FILTER 1
#define CONFIG_ASS_FILTER 1
#define CONFIG_
BENCH
_FILTER 1
#define CONFIG_
ATADENOISE
_FILTER 1
#define CONFIG_BBOX_FILTER 1
#define CONFIG_BENCH_FILTER 1
#define CONFIG_BITPLANENOISE_FILTER 1
#define CONFIG_BLACKDETECT_FILTER 1
#define CONFIG_BLACKFRAME_FILTER 1
#define CONFIG_BLEND_FILTER 1
...
...
@@ -1815,11 +1820,11 @@
#define CONFIG_HISTOGRAM_FILTER 1
#define CONFIG_HQDN3D_FILTER 1
#define CONFIG_HQX_FILTER 1
#define CONFIG_HSTACK_FILTER 1
#define CONFIG_HUE_FILTER 1
#define CONFIG_HWDOWNLOAD_FILTER 1
#define CONFIG_HWUPLOAD_FILTER 1
#define CONFIG_HWUPLOAD_CUDA_FILTER 0
#define CONFIG_HSTACK_FILTER 1
#define CONFIG_HUE_FILTER 1
#define CONFIG_IDET_FILTER 1
#define CONFIG_IL_FILTER 1
#define CONFIG_INFLATE_FILTER 1
...
...
@@ -1828,8 +1833,8 @@
#define CONFIG_KERNDEINT_FILTER 1
#define CONFIG_LENSCORRECTION_FILTER 1
#define CONFIG_LOOP_FILTER 1
#define CONFIG_LUT3D_FILTER 1
#define CONFIG_LUT_FILTER 1
#define CONFIG_LUT3D_FILTER 1
#define CONFIG_LUTRGB_FILTER 1
#define CONFIG_LUTYUV_FILTER 1
#define CONFIG_MASKEDMERGE_FILTER 1
...
...
@@ -1869,9 +1874,9 @@
#define CONFIG_ROTATE_FILTER 1
#define CONFIG_SAB_FILTER 1
#define CONFIG_SCALE_FILTER 1
#define CONFIG_SCALE2REF_FILTER 1
#define CONFIG_SCALE_NPP_FILTER 0
#define CONFIG_SCALE_VAAPI_FILTER 0
#define CONFIG_SCALE2REF_FILTER 1
#define CONFIG_SELECT_FILTER 1
#define CONFIG_SELECTIVECOLOR_FILTER 1
#define CONFIG_SENDCMD_FILTER 1
...
...
SMP/libavcodec.def
浏览文件 @
5e791e35
...
...
@@ -13,7 +13,14 @@ EXPORTS
av_bsf_free
av_bsf_get_by_name
av_bsf_get_class
av_bsf_get_null_filter
av_bsf_init
av_bsf_list_alloc
av_bsf_list_append
av_bsf_list_append2
av_bsf_list_finalize
av_bsf_list_free
av_bsf_list_parse_str
av_bsf_next
av_bsf_receive_packet
av_bsf_send_packet
...
...
SMP/libavfilter.vcxproj
浏览文件 @
5e791e35
...
...
@@ -115,10 +115,9 @@
<ClCompile
Include=
"..\libavfilter\af_adelay.c"
/>
<ClCompile
Include=
"..\libavfilter\af_aecho.c"
/>
<ClCompile
Include=
"..\libavfilter\af_aemphasis.c"
/>
<ClCompile
Include=
"..\libavfilter\aeval.c"
/>
<ClCompile
Include=
"..\libavfilter\af_afftfilt.c"
/>
<ClCompile
Include=
"..\libavfilter\window_func.c"
/>
<ClCompile
Include=
"..\libavfilter\af_anequalizer.c"
/>
<ClCompile
Include=
"..\libavfilter\aeval.c"
/>
<ClCompile
Include=
"..\libavfilter\af_aformat.c"
/>
<ClCompile
Include=
"..\libavfilter\af_agate.c"
/>
<ClCompile
Include=
"..\libavfilter\f_interleave.c"
/>
...
...
@@ -128,6 +127,7 @@
<ClCompile
Include=
"..\libavfilter\af_amerge.c"
/>
<ClCompile
Include=
"..\libavfilter\f_metadata.c"
/>
<ClCompile
Include=
"..\libavfilter\af_amix.c"
/>
<ClCompile
Include=
"..\libavfilter\af_anequalizer.c"
/>
<ClCompile
Include=
"..\libavfilter\af_anull.c"
/>
<ClCompile
Include=
"..\libavfilter\af_apad.c"
/>
<ClCompile
Include=
"..\libavfilter\f_perms.c"
/>
...
...
@@ -162,6 +162,7 @@
<ClCompile
Include=
"..\libavfilter\af_extrastereo.c"
/>
<ClCompile
Include=
"..\libavfilter\af_firequalizer.c"
/>
<ClCompile
Include=
"..\libavfilter\af_flanger.c"
/>
<ClCompile
Include=
"..\libavfilter\af_hdcd.c"
/>
<ClCompile
Include=
"..\libavfilter\af_join.c"
/>
<ClCompile
Include=
"..\libavfilter\af_pan.c"
/>
<ClCompile
Include=
"..\libavfilter\af_replaygain.c"
/>
...
...
@@ -172,17 +173,17 @@
<ClCompile
Include=
"..\libavfilter\af_tremolo.c"
/>
<ClCompile
Include=
"..\libavfilter\af_vibrato.c"
/>
<ClCompile
Include=
"..\libavfilter\af_volumedetect.c"
/>
<ClCompile
Include=
"..\libavfilter\af_hdcd.c"
/>
<ClCompile
Include=
"..\libavfilter\asrc_anoisesrc.c"
/>
<ClCompile
Include=
"..\libavfilter\asrc_sine.c"
/>
<ClCompile
Include=
"..\libavfilter\asink_anullsink.c"
/>
<ClCompile
Include=
"..\libavfilter\asrc_anullsrc.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_subtitles.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_extractplanes.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_alphamerge.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_subtitles.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_atadenoise.c"
/>
<ClCompile
Include=
"..\libavfilter\bbox.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_bbox.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_bitplanenoise.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_blackdetect.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_blackframe.c"
/>
<ClCompile
Include=
"..\libavfilter\dualinput.c"
/>
...
...
@@ -217,8 +218,8 @@
<ClCompile
Include=
"..\libavfilter\vf_drawbox.c"
/>
<ClCompile
Include=
"..\libavfilter\f_drawgraph.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_drawtext.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_elbg.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_edgedetect.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_elbg.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_eq.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_fade.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_fftfilt.c"
/>
...
...
@@ -238,10 +239,10 @@
<ClCompile
Include=
"..\libavfilter\vf_histeq.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_histogram.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_hqx.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_hwdownload.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_hwupload.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_stack.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_hue.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_hwdownload.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_hwupload.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_il.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_kerndeint.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_lenscorrection.c"
/>
...
...
@@ -269,10 +270,10 @@
<ClCompile
Include=
"..\libavfilter\vf_removelogo.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_repeatfields.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_rotate.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_separatefields.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_sab.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_scale.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_selectivecolor.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_separatefields.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_aspect.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_setfield.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_showinfo.c"
/>
...
...
SMP/libavfilter.vcxproj.filters
浏览文件 @
5e791e35
...
...
@@ -165,16 +165,13 @@
<ClCompile
Include=
"..\libavfilter\af_aemphasis.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_afftfilt.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\window_func.c"
>
<ClCompile
Include=
"..\libavfilter\aeval.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_a
nequalizer
.c"
>
<ClCompile
Include=
"..\libavfilter\af_a
fftfilt
.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\
aeval
.c"
>
<ClCompile
Include=
"..\libavfilter\
window_func
.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_aformat.c"
>
...
...
@@ -204,6 +201,9 @@
<ClCompile
Include=
"..\libavfilter\af_amix.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_anequalizer.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_anull.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -306,6 +306,9 @@
<ClCompile
Include=
"..\libavfilter\af_flanger.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_hdcd.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_join.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -336,9 +339,6 @@
<ClCompile
Include=
"..\libavfilter\af_volumedetect.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_hdcd.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\asrc_anoisesrc.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -351,15 +351,15 @@
<ClCompile
Include=
"..\libavfilter\asrc_anullsrc.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_subtitles.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_extractplanes.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_alphamerge.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_subtitles.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_atadenoise.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -369,6 +369,9 @@
<ClCompile
Include=
"..\libavfilter\vf_bbox.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_bitplanenoise.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_blackdetect.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -471,10 +474,10 @@
<ClCompile
Include=
"..\libavfilter\vf_drawtext.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_e
lbg
.c"
>
<ClCompile
Include=
"..\libavfilter\vf_e
dgedetect
.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_e
dgedetect
.c"
>
<ClCompile
Include=
"..\libavfilter\vf_e
lbg
.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_eq.c"
>
...
...
@@ -534,16 +537,16 @@
<ClCompile
Include=
"..\libavfilter\vf_hqx.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_
hwdownload
.c"
>
<ClCompile
Include=
"..\libavfilter\vf_
stack
.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_h
wupload
.c"
>
<ClCompile
Include=
"..\libavfilter\vf_h
ue
.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_
stack
.c"
>
<ClCompile
Include=
"..\libavfilter\vf_
hwdownload
.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_h
ue
.c"
>
<ClCompile
Include=
"..\libavfilter\vf_h
wupload
.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_il.c"
>
...
...
@@ -627,9 +630,6 @@
<ClCompile
Include=
"..\libavfilter\vf_rotate.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_separatefields.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_sab.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -639,6 +639,9 @@
<ClCompile
Include=
"..\libavfilter\vf_selectivecolor.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_separatefields.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_aspect.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
SMP/libavutil.def
浏览文件 @
5e791e35
...
...
@@ -455,6 +455,7 @@ EXPORTS
av_xtea_le_crypt
av_xtea_le_init
avpriv_alloc_fixed_dsp
avpriv_dict_set_timestamp
avpriv_emms_yasm
avpriv_float_dsp_alloc
avpriv_frame_get_metadatap
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录