Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
c3fd4674
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,发现更多精彩内容 >>
提交
c3fd4674
编写于
10月 08, 2018
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
project: Update for recent upstream merge.
上级
ac1fe1a2
变更
13
显示空白变更内容
内联
并排
Showing
13 changed file
with
74 addition
and
5 deletion
+74
-5
SMP/config.asm
SMP/config.asm
+9
-0
SMP/config.h
SMP/config.h
+9
-0
SMP/libavcodec.vcxproj
SMP/libavcodec.vcxproj
+7
-1
SMP/libavcodec.vcxproj.filters
SMP/libavcodec.vcxproj.filters
+21
-3
SMP/libavcodec/bsf_list.c
SMP/libavcodec/bsf_list.c
+1
-0
SMP/libavcodec/codec_list.c
SMP/libavcodec/codec_list.c
+1
-0
SMP/libavcodec/parser_list.c
SMP/libavcodec/parser_list.c
+1
-0
SMP/libavfilter.vcxproj
SMP/libavfilter.vcxproj
+4
-0
SMP/libavfilter.vcxproj.filters
SMP/libavfilter.vcxproj.filters
+12
-0
SMP/libavfilter/filter_list.c
SMP/libavfilter/filter_list.c
+4
-0
SMP/libavformat.vcxproj
SMP/libavformat.vcxproj
+1
-0
SMP/libavformat.vcxproj.filters
SMP/libavformat.vcxproj.filters
+3
-0
SMP/libavutil/ffversion.h
SMP/libavutil/ffversion.h
+1
-1
未找到文件。
SMP/config.asm
浏览文件 @
c3fd4674
...
@@ -615,8 +615,10 @@
...
@@ -615,8 +615,10 @@
%define CONFIG_BSWAPDSP 1
%define CONFIG_BSWAPDSP 1
%define CONFIG_CABAC 1
%define CONFIG_CABAC 1
%define CONFIG_CBS 1
%define CONFIG_CBS 1
%define CONFIG_CBS_AV1 1
%define CONFIG_CBS_H264 1
%define CONFIG_CBS_H264 1
%define CONFIG_CBS_H265 1
%define CONFIG_CBS_H265 1
%define CONFIG_CBS_JPEG 1
%define CONFIG_CBS_MPEG2 1
%define CONFIG_CBS_MPEG2 1
%define CONFIG_CBS_VP9 1
%define CONFIG_CBS_VP9 1
%define CONFIG_DIRAC_PARSE 1
%define CONFIG_DIRAC_PARSE 1
...
@@ -694,6 +696,7 @@
...
@@ -694,6 +696,7 @@
%define CONFIG_WMA_FREQS 1
%define CONFIG_WMA_FREQS 1
%define CONFIG_WMV2DSP 1
%define CONFIG_WMV2DSP 1
%define CONFIG_AAC_ADTSTOASC_BSF 1
%define CONFIG_AAC_ADTSTOASC_BSF 1
%define CONFIG_AV1_METADATA_BSF 1
%define CONFIG_CHOMP_BSF 1
%define CONFIG_CHOMP_BSF 1
%define CONFIG_DUMP_EXTRADATA_BSF 1
%define CONFIG_DUMP_EXTRADATA_BSF 1
%define CONFIG_DCA_CORE_BSF 1
%define CONFIG_DCA_CORE_BSF 1
...
@@ -1025,6 +1028,7 @@
...
@@ -1025,6 +1028,7 @@
%define CONFIG_GSM_DECODER 1
%define CONFIG_GSM_DECODER 1
%define CONFIG_GSM_MS_DECODER 1
%define CONFIG_GSM_MS_DECODER 1
%define CONFIG_IAC_DECODER 1
%define CONFIG_IAC_DECODER 1
%define CONFIG_ILBC_DECODER 1
%define CONFIG_IMC_DECODER 1
%define CONFIG_IMC_DECODER 1
%define CONFIG_INTERPLAY_ACM_DECODER 1
%define CONFIG_INTERPLAY_ACM_DECODER 1
%define CONFIG_MACE3_DECODER 1
%define CONFIG_MACE3_DECODER 1
...
@@ -1497,6 +1501,7 @@
...
@@ -1497,6 +1501,7 @@
%define CONFIG_AAC_LATM_PARSER 1
%define CONFIG_AAC_LATM_PARSER 1
%define CONFIG_AC3_PARSER 1
%define CONFIG_AC3_PARSER 1
%define CONFIG_ADX_PARSER 1
%define CONFIG_ADX_PARSER 1
%define CONFIG_AV1_PARSER 1
%define CONFIG_AVS2_PARSER 1
%define CONFIG_AVS2_PARSER 1
%define CONFIG_BMP_PARSER 1
%define CONFIG_BMP_PARSER 1
%define CONFIG_CAVSVIDEO_PARSER 1
%define CONFIG_CAVSVIDEO_PARSER 1
...
@@ -1575,6 +1580,7 @@
...
@@ -1575,6 +1580,7 @@
%define CONFIG_ACOPY_FILTER 1
%define CONFIG_ACOPY_FILTER 1
%define CONFIG_ACUE_FILTER 1
%define CONFIG_ACUE_FILTER 1
%define CONFIG_ACROSSFADE_FILTER 1
%define CONFIG_ACROSSFADE_FILTER 1
%define CONFIG_ACROSSOVER_FILTER 1
%define CONFIG_ACRUSHER_FILTER 1
%define CONFIG_ACRUSHER_FILTER 1
%define CONFIG_ADECLICK_FILTER 1
%define CONFIG_ADECLICK_FILTER 1
%define CONFIG_ADECLIP_FILTER 1
%define CONFIG_ADECLIP_FILTER 1
...
@@ -1584,6 +1590,7 @@
...
@@ -1584,6 +1590,7 @@
%define CONFIG_AEMPHASIS_FILTER 1
%define CONFIG_AEMPHASIS_FILTER 1
%define CONFIG_AEVAL_FILTER 1
%define CONFIG_AEVAL_FILTER 1
%define CONFIG_AFADE_FILTER 1
%define CONFIG_AFADE_FILTER 1
%define CONFIG_AFFTDN_FILTER 1
%define CONFIG_AFFTFILT_FILTER 1
%define CONFIG_AFFTFILT_FILTER 1
%define CONFIG_AFIR_FILTER 1
%define CONFIG_AFIR_FILTER 1
%define CONFIG_AFORMAT_FILTER 1
%define CONFIG_AFORMAT_FILTER 1
...
@@ -1597,6 +1604,7 @@
...
@@ -1597,6 +1604,7 @@
%define CONFIG_AMERGE_FILTER 1
%define CONFIG_AMERGE_FILTER 1
%define CONFIG_AMETADATA_FILTER 1
%define CONFIG_AMETADATA_FILTER 1
%define CONFIG_AMIX_FILTER 1
%define CONFIG_AMIX_FILTER 1
%define CONFIG_AMULTIPLY_FILTER 1
%define CONFIG_ANEQUALIZER_FILTER 1
%define CONFIG_ANEQUALIZER_FILTER 1
%define CONFIG_ANULL_FILTER 1
%define CONFIG_ANULL_FILTER 1
%define CONFIG_APAD_FILTER 1
%define CONFIG_APAD_FILTER 1
...
@@ -1691,6 +1699,7 @@
...
@@ -1691,6 +1699,7 @@
%define CONFIG_BLACKDETECT_FILTER 1
%define CONFIG_BLACKDETECT_FILTER 1
%define CONFIG_BLACKFRAME_FILTER 1
%define CONFIG_BLACKFRAME_FILTER 1
%define CONFIG_BLEND_FILTER 1
%define CONFIG_BLEND_FILTER 1
%define CONFIG_BM3D_FILTER 1
%define CONFIG_BOXBLUR_FILTER 1
%define CONFIG_BOXBLUR_FILTER 1
%define CONFIG_BOXBLUR_OPENCL_FILTER 0
%define CONFIG_BOXBLUR_OPENCL_FILTER 0
%define CONFIG_BWDIF_FILTER 1
%define CONFIG_BWDIF_FILTER 1
...
...
SMP/config.h
浏览文件 @
c3fd4674
...
@@ -680,8 +680,10 @@
...
@@ -680,8 +680,10 @@
#define CONFIG_BSWAPDSP 1
#define CONFIG_BSWAPDSP 1
#define CONFIG_CABAC 1
#define CONFIG_CABAC 1
#define CONFIG_CBS 1
#define CONFIG_CBS 1
#define CONFIG_CBS_AV1 1
#define CONFIG_CBS_H264 1
#define CONFIG_CBS_H264 1
#define CONFIG_CBS_H265 1
#define CONFIG_CBS_H265 1
#define CONFIG_CBS_JPEG 1
#define CONFIG_CBS_MPEG2 1
#define CONFIG_CBS_MPEG2 1
#define CONFIG_CBS_VP9 1
#define CONFIG_CBS_VP9 1
#define CONFIG_DIRAC_PARSE 1
#define CONFIG_DIRAC_PARSE 1
...
@@ -759,6 +761,7 @@
...
@@ -759,6 +761,7 @@
#define CONFIG_WMA_FREQS 1
#define CONFIG_WMA_FREQS 1
#define CONFIG_WMV2DSP 1
#define CONFIG_WMV2DSP 1
#define CONFIG_AAC_ADTSTOASC_BSF 1
#define CONFIG_AAC_ADTSTOASC_BSF 1
#define CONFIG_AV1_METADATA_BSF 1
#define CONFIG_CHOMP_BSF 1
#define CONFIG_CHOMP_BSF 1
#define CONFIG_DUMP_EXTRADATA_BSF 1
#define CONFIG_DUMP_EXTRADATA_BSF 1
#define CONFIG_DCA_CORE_BSF 1
#define CONFIG_DCA_CORE_BSF 1
...
@@ -1090,6 +1093,7 @@
...
@@ -1090,6 +1093,7 @@
#define CONFIG_GSM_DECODER 1
#define CONFIG_GSM_DECODER 1
#define CONFIG_GSM_MS_DECODER 1
#define CONFIG_GSM_MS_DECODER 1
#define CONFIG_IAC_DECODER 1
#define CONFIG_IAC_DECODER 1
#define CONFIG_ILBC_DECODER 1
#define CONFIG_IMC_DECODER 1
#define CONFIG_IMC_DECODER 1
#define CONFIG_INTERPLAY_ACM_DECODER 1
#define CONFIG_INTERPLAY_ACM_DECODER 1
#define CONFIG_MACE3_DECODER 1
#define CONFIG_MACE3_DECODER 1
...
@@ -1583,6 +1587,7 @@
...
@@ -1583,6 +1587,7 @@
#define CONFIG_AAC_LATM_PARSER 1
#define CONFIG_AAC_LATM_PARSER 1
#define CONFIG_AC3_PARSER 1
#define CONFIG_AC3_PARSER 1
#define CONFIG_ADX_PARSER 1
#define CONFIG_ADX_PARSER 1
#define CONFIG_AV1_PARSER 1
#define CONFIG_AVS2_PARSER 1
#define CONFIG_AVS2_PARSER 1
#define CONFIG_BMP_PARSER 1
#define CONFIG_BMP_PARSER 1
#define CONFIG_CAVSVIDEO_PARSER 1
#define CONFIG_CAVSVIDEO_PARSER 1
...
@@ -1661,6 +1666,7 @@
...
@@ -1661,6 +1666,7 @@
#define CONFIG_ACOPY_FILTER 1
#define CONFIG_ACOPY_FILTER 1
#define CONFIG_ACUE_FILTER 1
#define CONFIG_ACUE_FILTER 1
#define CONFIG_ACROSSFADE_FILTER 1
#define CONFIG_ACROSSFADE_FILTER 1
#define CONFIG_ACROSSOVER_FILTER 1
#define CONFIG_ACRUSHER_FILTER 1
#define CONFIG_ACRUSHER_FILTER 1
#define CONFIG_ADECLICK_FILTER 1
#define CONFIG_ADECLICK_FILTER 1
#define CONFIG_ADECLIP_FILTER 1
#define CONFIG_ADECLIP_FILTER 1
...
@@ -1670,6 +1676,7 @@
...
@@ -1670,6 +1676,7 @@
#define CONFIG_AEMPHASIS_FILTER 1
#define CONFIG_AEMPHASIS_FILTER 1
#define CONFIG_AEVAL_FILTER 1
#define CONFIG_AEVAL_FILTER 1
#define CONFIG_AFADE_FILTER 1
#define CONFIG_AFADE_FILTER 1
#define CONFIG_AFFTDN_FILTER 1
#define CONFIG_AFFTFILT_FILTER 1
#define CONFIG_AFFTFILT_FILTER 1
#define CONFIG_AFIR_FILTER 1
#define CONFIG_AFIR_FILTER 1
#define CONFIG_AFORMAT_FILTER 1
#define CONFIG_AFORMAT_FILTER 1
...
@@ -1683,6 +1690,7 @@
...
@@ -1683,6 +1690,7 @@
#define CONFIG_AMERGE_FILTER 1
#define CONFIG_AMERGE_FILTER 1
#define CONFIG_AMETADATA_FILTER 1
#define CONFIG_AMETADATA_FILTER 1
#define CONFIG_AMIX_FILTER 1
#define CONFIG_AMIX_FILTER 1
#define CONFIG_AMULTIPLY_FILTER 1
#define CONFIG_ANEQUALIZER_FILTER 1
#define CONFIG_ANEQUALIZER_FILTER 1
#define CONFIG_ANULL_FILTER 1
#define CONFIG_ANULL_FILTER 1
#define CONFIG_APAD_FILTER 1
#define CONFIG_APAD_FILTER 1
...
@@ -1777,6 +1785,7 @@
...
@@ -1777,6 +1785,7 @@
#define CONFIG_BLACKDETECT_FILTER 1
#define CONFIG_BLACKDETECT_FILTER 1
#define CONFIG_BLACKFRAME_FILTER 1
#define CONFIG_BLACKFRAME_FILTER 1
#define CONFIG_BLEND_FILTER 1
#define CONFIG_BLEND_FILTER 1
#define CONFIG_BM3D_FILTER 1
#define CONFIG_BOXBLUR_FILTER 1
#define CONFIG_BOXBLUR_FILTER 1
#define CONFIG_BOXBLUR_OPENCL_FILTER 0
#define CONFIG_BOXBLUR_OPENCL_FILTER 0
#define CONFIG_BWDIF_FILTER 1
#define CONFIG_BWDIF_FILTER 1
...
...
SMP/libavcodec.vcxproj
浏览文件 @
c3fd4674
...
@@ -202,8 +202,10 @@
...
@@ -202,8 +202,10 @@
<ClCompile
Include=
"..\libavcodec\audio_frame_queue.c"
/>
<ClCompile
Include=
"..\libavcodec\audio_frame_queue.c"
/>
<ClCompile
Include=
"..\libavcodec\cabac.c"
/>
<ClCompile
Include=
"..\libavcodec\cabac.c"
/>
<ClCompile
Include=
"..\libavcodec\cbs.c"
/>
<ClCompile
Include=
"..\libavcodec\cbs.c"
/>
<ClCompile
Include=
"..\libavcodec\cbs_av1.c"
/>
<ClCompile
Include=
"..\libavcodec\cbs_h2645.c"
/>
<ClCompile
Include=
"..\libavcodec\cbs_h2645.c"
/>
<ClCompile
Include=
"..\libavcodec\h2645_parse.c"
/>
<ClCompile
Include=
"..\libavcodec\h2645_parse.c"
/>
<ClCompile
Include=
"..\libavcodec\cbs_jpeg.c"
/>
<ClCompile
Include=
"..\libavcodec\cbs_mpeg2.c"
/>
<ClCompile
Include=
"..\libavcodec\cbs_mpeg2.c"
/>
<ClCompile
Include=
"..\libavcodec\cbs_vp9.c"
/>
<ClCompile
Include=
"..\libavcodec\cbs_vp9.c"
/>
<ClCompile
Include=
"..\libavcodec\dct.c"
/>
<ClCompile
Include=
"..\libavcodec\dct.c"
/>
...
@@ -551,6 +553,7 @@
...
@@ -551,6 +553,7 @@
<ClCompile
Include=
"..\libavcodec\huffyuvenc.c"
/>
<ClCompile
Include=
"..\libavcodec\huffyuvenc.c"
/>
<ClCompile
Include=
"..\libavcodec\idcinvideo.c"
/>
<ClCompile
Include=
"..\libavcodec\idcinvideo.c"
/>
<ClCompile
Include=
"..\libavcodec\iff.c"
/>
<ClCompile
Include=
"..\libavcodec\iff.c"
/>
<ClCompile
Include=
"..\libavcodec\ilbcdec.c"
/>
<ClCompile
Include=
"..\libavcodec\imc.c"
/>
<ClCompile
Include=
"..\libavcodec\imc.c"
/>
<ClCompile
Include=
"..\libavcodec\imm4.c"
/>
<ClCompile
Include=
"..\libavcodec\imm4.c"
/>
<ClCompile
Include=
"..\libavcodec\indeo2.c"
/>
<ClCompile
Include=
"..\libavcodec\indeo2.c"
/>
...
@@ -892,6 +895,8 @@
...
@@ -892,6 +895,8 @@
<ClCompile
Include=
"..\libavcodec\aac_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\aac_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\aac_ac3_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\aac_ac3_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\adx_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\adx_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\av1_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\av1_parse.c"
/>
<ClCompile
Include=
"..\libavcodec\avs2_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\avs2_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\bmp_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\bmp_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\cavs_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\cavs_parser.c"
/>
...
@@ -929,14 +934,15 @@
...
@@ -929,14 +934,15 @@
<ClCompile
Include=
"..\libavcodec\vp9_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\vp9_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\xma_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\xma_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\aac_adtstoasc_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\aac_adtstoasc_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\av1_metadata_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\chomp_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\chomp_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\dump_extradata_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\dump_extradata_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\dca_core_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\dca_core_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\eac3_core_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\eac3_core_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\extract_extradata_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\extract_extradata_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\av1_parse.c"
/>
<ClCompile
Include=
"..\libavcodec\filter_units_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\filter_units_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_metadata_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_metadata_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_levels.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_mp4toannexb_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_mp4toannexb_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_redundant_pps_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_redundant_pps_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\hapqa_extract_bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\hapqa_extract_bsf.c"
/>
...
...
SMP/libavcodec.vcxproj.filters
浏览文件 @
c3fd4674
...
@@ -429,12 +429,18 @@
...
@@ -429,12 +429,18 @@
<ClCompile
Include=
"..\libavcodec\cbs.c"
>
<ClCompile
Include=
"..\libavcodec\cbs.c"
>
<Filter>
Source Files\libavcodec
</Filter>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\cbs_av1.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\cbs_h2645.c"
>
<ClCompile
Include=
"..\libavcodec\cbs_h2645.c"
>
<Filter>
Source Files\libavcodec
</Filter>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\h2645_parse.c"
>
<ClCompile
Include=
"..\libavcodec\h2645_parse.c"
>
<Filter>
Source Files\libavcodec
</Filter>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\cbs_jpeg.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\cbs_mpeg2.c"
>
<ClCompile
Include=
"..\libavcodec\cbs_mpeg2.c"
>
<Filter>
Source Files\libavcodec
</Filter>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
</ClCompile>
...
@@ -1476,6 +1482,9 @@
...
@@ -1476,6 +1482,9 @@
<ClCompile
Include=
"..\libavcodec\iff.c"
>
<ClCompile
Include=
"..\libavcodec\iff.c"
>
<Filter>
Source Files\libavcodec
</Filter>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\ilbcdec.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\imc.c"
>
<ClCompile
Include=
"..\libavcodec\imc.c"
>
<Filter>
Source Files\libavcodec
</Filter>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
</ClCompile>
...
@@ -2499,6 +2508,12 @@
...
@@ -2499,6 +2508,12 @@
<ClCompile
Include=
"..\libavcodec\adx_parser.c"
>
<ClCompile
Include=
"..\libavcodec\adx_parser.c"
>
<Filter>
Source Files\libavcodec
</Filter>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\av1_parser.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\av1_parse.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\avs2_parser.c"
>
<ClCompile
Include=
"..\libavcodec\avs2_parser.c"
>
<Filter>
Source Files\libavcodec
</Filter>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
</ClCompile>
...
@@ -2610,6 +2625,9 @@
...
@@ -2610,6 +2625,9 @@
<ClCompile
Include=
"..\libavcodec\aac_adtstoasc_bsf.c"
>
<ClCompile
Include=
"..\libavcodec\aac_adtstoasc_bsf.c"
>
<Filter>
Source Files\libavcodec
</Filter>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\av1_metadata_bsf.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\chomp_bsf.c"
>
<ClCompile
Include=
"..\libavcodec\chomp_bsf.c"
>
<Filter>
Source Files\libavcodec
</Filter>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
</ClCompile>
...
@@ -2625,15 +2643,15 @@
...
@@ -2625,15 +2643,15 @@
<ClCompile
Include=
"..\libavcodec\extract_extradata_bsf.c"
>
<ClCompile
Include=
"..\libavcodec\extract_extradata_bsf.c"
>
<Filter>
Source Files\libavcodec
</Filter>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\av1_parse.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\filter_units_bsf.c"
>
<ClCompile
Include=
"..\libavcodec\filter_units_bsf.c"
>
<Filter>
Source Files\libavcodec
</Filter>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\h264_metadata_bsf.c"
>
<ClCompile
Include=
"..\libavcodec\h264_metadata_bsf.c"
>
<Filter>
Source Files\libavcodec
</Filter>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\h264_levels.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\h264_mp4toannexb_bsf.c"
>
<ClCompile
Include=
"..\libavcodec\h264_mp4toannexb_bsf.c"
>
<Filter>
Source Files\libavcodec
</Filter>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
</ClCompile>
...
...
SMP/libavcodec/bsf_list.c
浏览文件 @
c3fd4674
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
*/
*/
static
const
AVBitStreamFilter
*
bitstream_filters
[]
=
{
static
const
AVBitStreamFilter
*
bitstream_filters
[]
=
{
&
ff_aac_adtstoasc_bsf
,
&
ff_aac_adtstoasc_bsf
,
&
ff_av1_metadata_bsf
,
&
ff_chomp_bsf
,
&
ff_chomp_bsf
,
&
ff_dump_extradata_bsf
,
&
ff_dump_extradata_bsf
,
&
ff_dca_core_bsf
,
&
ff_dca_core_bsf
,
...
...
SMP/libavcodec/codec_list.c
浏览文件 @
c3fd4674
...
@@ -472,6 +472,7 @@ static const AVCodec *codec_list[] = {
...
@@ -472,6 +472,7 @@ static const AVCodec *codec_list[] = {
&
ff_gsm_decoder
,
&
ff_gsm_decoder
,
&
ff_gsm_ms_decoder
,
&
ff_gsm_ms_decoder
,
&
ff_iac_decoder
,
&
ff_iac_decoder
,
&
ff_ilbc_decoder
,
&
ff_imc_decoder
,
&
ff_imc_decoder
,
&
ff_interplay_acm_decoder
,
&
ff_interplay_acm_decoder
,
&
ff_mace3_decoder
,
&
ff_mace3_decoder
,
...
...
SMP/libavcodec/parser_list.c
浏览文件 @
c3fd4674
...
@@ -23,6 +23,7 @@ static const AVCodecParser *parser_list[] = {
...
@@ -23,6 +23,7 @@ static const AVCodecParser *parser_list[] = {
&
ff_aac_latm_parser
,
&
ff_aac_latm_parser
,
&
ff_ac3_parser
,
&
ff_ac3_parser
,
&
ff_adx_parser
,
&
ff_adx_parser
,
&
ff_av1_parser
,
&
ff_avs2_parser
,
&
ff_avs2_parser
,
&
ff_bmp_parser
,
&
ff_bmp_parser
,
&
ff_cavsvideo_parser
,
&
ff_cavsvideo_parser
,
...
...
SMP/libavfilter.vcxproj
浏览文件 @
c3fd4674
...
@@ -122,6 +122,7 @@
...
@@ -122,6 +122,7 @@
<ClCompile
Include=
"..\libavfilter\af_acontrast.c"
/>
<ClCompile
Include=
"..\libavfilter\af_acontrast.c"
/>
<ClCompile
Include=
"..\libavfilter\af_acopy.c"
/>
<ClCompile
Include=
"..\libavfilter\af_acopy.c"
/>
<ClCompile
Include=
"..\libavfilter\af_afade.c"
/>
<ClCompile
Include=
"..\libavfilter\af_afade.c"
/>
<ClCompile
Include=
"..\libavfilter\af_acrossover.c"
/>
<ClCompile
Include=
"..\libavfilter\af_acrusher.c"
/>
<ClCompile
Include=
"..\libavfilter\af_acrusher.c"
/>
<ClCompile
Include=
"..\libavfilter\f_cue.c"
/>
<ClCompile
Include=
"..\libavfilter\f_cue.c"
/>
<ClCompile
Include=
"..\libavfilter\af_adeclick.c"
/>
<ClCompile
Include=
"..\libavfilter\af_adeclick.c"
/>
...
@@ -130,6 +131,7 @@
...
@@ -130,6 +131,7 @@
<ClCompile
Include=
"..\libavfilter\af_aecho.c"
/>
<ClCompile
Include=
"..\libavfilter\af_aecho.c"
/>
<ClCompile
Include=
"..\libavfilter\af_aemphasis.c"
/>
<ClCompile
Include=
"..\libavfilter\af_aemphasis.c"
/>
<ClCompile
Include=
"..\libavfilter\aeval.c"
/>
<ClCompile
Include=
"..\libavfilter\aeval.c"
/>
<ClCompile
Include=
"..\libavfilter\af_afftdn.c"
/>
<ClCompile
Include=
"..\libavfilter\af_afftfilt.c"
/>
<ClCompile
Include=
"..\libavfilter\af_afftfilt.c"
/>
<ClCompile
Include=
"..\libavfilter\af_aformat.c"
/>
<ClCompile
Include=
"..\libavfilter\af_aformat.c"
/>
<ClCompile
Include=
"..\libavfilter\af_agate.c"
/>
<ClCompile
Include=
"..\libavfilter\af_agate.c"
/>
...
@@ -141,6 +143,7 @@
...
@@ -141,6 +143,7 @@
<ClCompile
Include=
"..\libavfilter\af_amerge.c"
/>
<ClCompile
Include=
"..\libavfilter\af_amerge.c"
/>
<ClCompile
Include=
"..\libavfilter\f_metadata.c"
/>
<ClCompile
Include=
"..\libavfilter\f_metadata.c"
/>
<ClCompile
Include=
"..\libavfilter\af_amix.c"
/>
<ClCompile
Include=
"..\libavfilter\af_amix.c"
/>
<ClCompile
Include=
"..\libavfilter\af_amultiply.c"
/>
<ClCompile
Include=
"..\libavfilter\af_anequalizer.c"
/>
<ClCompile
Include=
"..\libavfilter\af_anequalizer.c"
/>
<ClCompile
Include=
"..\libavfilter\af_anull.c"
/>
<ClCompile
Include=
"..\libavfilter\af_anull.c"
/>
<ClCompile
Include=
"..\libavfilter\af_apad.c"
/>
<ClCompile
Include=
"..\libavfilter\af_apad.c"
/>
...
@@ -214,6 +217,7 @@
...
@@ -214,6 +217,7 @@
<ClCompile
Include=
"..\libavfilter\vf_bitplanenoise.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_bitplanenoise.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_blackdetect.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_blackdetect.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_blackframe.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_blackframe.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_bm3d.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_boxblur.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_boxblur.c"
/>
<ClCompile
Include=
"..\libavfilter\boxblur.c"
/>
<ClCompile
Include=
"..\libavfilter\boxblur.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_chromakey.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_chromakey.c"
/>
...
...
SMP/libavfilter.vcxproj.filters
浏览文件 @
c3fd4674
...
@@ -189,6 +189,9 @@
...
@@ -189,6 +189,9 @@
<ClCompile
Include=
"..\libavfilter\af_afade.c"
>
<ClCompile
Include=
"..\libavfilter\af_afade.c"
>
<Filter>
Source Files\libavfilter
</Filter>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_acrossover.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_acrusher.c"
>
<ClCompile
Include=
"..\libavfilter\af_acrusher.c"
>
<Filter>
Source Files\libavfilter
</Filter>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
</ClCompile>
...
@@ -213,6 +216,9 @@
...
@@ -213,6 +216,9 @@
<ClCompile
Include=
"..\libavfilter\aeval.c"
>
<ClCompile
Include=
"..\libavfilter\aeval.c"
>
<Filter>
Source Files\libavfilter
</Filter>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_afftdn.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_afftfilt.c"
>
<ClCompile
Include=
"..\libavfilter\af_afftfilt.c"
>
<Filter>
Source Files\libavfilter
</Filter>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
</ClCompile>
...
@@ -246,6 +252,9 @@
...
@@ -246,6 +252,9 @@
<ClCompile
Include=
"..\libavfilter\af_amix.c"
>
<ClCompile
Include=
"..\libavfilter\af_amix.c"
>
<Filter>
Source Files\libavfilter
</Filter>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_amultiply.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_anequalizer.c"
>
<ClCompile
Include=
"..\libavfilter\af_anequalizer.c"
>
<Filter>
Source Files\libavfilter
</Filter>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
</ClCompile>
...
@@ -465,6 +474,9 @@
...
@@ -465,6 +474,9 @@
<ClCompile
Include=
"..\libavfilter\vf_blackframe.c"
>
<ClCompile
Include=
"..\libavfilter\vf_blackframe.c"
>
<Filter>
Source Files\libavfilter
</Filter>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_bm3d.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_boxblur.c"
>
<ClCompile
Include=
"..\libavfilter\vf_boxblur.c"
>
<Filter>
Source Files\libavfilter
</Filter>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
</ClCompile>
...
...
SMP/libavfilter/filter_list.c
浏览文件 @
c3fd4674
...
@@ -25,6 +25,7 @@ static const AVFilter *filter_list[] = {
...
@@ -25,6 +25,7 @@ static const AVFilter *filter_list[] = {
&
ff_af_acopy
,
&
ff_af_acopy
,
&
ff_af_acue
,
&
ff_af_acue
,
&
ff_af_acrossfade
,
&
ff_af_acrossfade
,
&
ff_af_acrossover
,
&
ff_af_acrusher
,
&
ff_af_acrusher
,
&
ff_af_adeclick
,
&
ff_af_adeclick
,
&
ff_af_adeclip
,
&
ff_af_adeclip
,
...
@@ -34,6 +35,7 @@ static const AVFilter *filter_list[] = {
...
@@ -34,6 +35,7 @@ static const AVFilter *filter_list[] = {
&
ff_af_aemphasis
,
&
ff_af_aemphasis
,
&
ff_af_aeval
,
&
ff_af_aeval
,
&
ff_af_afade
,
&
ff_af_afade
,
&
ff_af_afftdn
,
&
ff_af_afftfilt
,
&
ff_af_afftfilt
,
&
ff_af_afir
,
&
ff_af_afir
,
&
ff_af_aformat
,
&
ff_af_aformat
,
...
@@ -47,6 +49,7 @@ static const AVFilter *filter_list[] = {
...
@@ -47,6 +49,7 @@ static const AVFilter *filter_list[] = {
&
ff_af_amerge
,
&
ff_af_amerge
,
&
ff_af_ametadata
,
&
ff_af_ametadata
,
&
ff_af_amix
,
&
ff_af_amix
,
&
ff_af_amultiply
,
&
ff_af_anequalizer
,
&
ff_af_anequalizer
,
&
ff_af_anull
,
&
ff_af_anull
,
&
ff_af_apad
,
&
ff_af_apad
,
...
@@ -132,6 +135,7 @@ static const AVFilter *filter_list[] = {
...
@@ -132,6 +135,7 @@ static const AVFilter *filter_list[] = {
&
ff_vf_blackdetect
,
&
ff_vf_blackdetect
,
&
ff_vf_blackframe
,
&
ff_vf_blackframe
,
&
ff_vf_blend
,
&
ff_vf_blend
,
&
ff_vf_bm3d
,
&
ff_vf_boxblur
,
&
ff_vf_boxblur
,
&
ff_vf_bwdif
,
&
ff_vf_bwdif
,
&
ff_vf_chromakey
,
&
ff_vf_chromakey
,
...
...
SMP/libavformat.vcxproj
浏览文件 @
c3fd4674
...
@@ -523,6 +523,7 @@
...
@@ -523,6 +523,7 @@
<ClCompile
Include=
"..\libavformat\rtmpproto.c"
/>
<ClCompile
Include=
"..\libavformat\rtmpproto.c"
/>
<ClCompile
Include=
"..\libavformat\rtmppkt.c"
/>
<ClCompile
Include=
"..\libavformat\rtmppkt.c"
/>
<ClCompile
Include=
"..\libavformat\rtpproto.c"
/>
<ClCompile
Include=
"..\libavformat\rtpproto.c"
/>
<ClCompile
Include=
"..\libavformat\ip.c"
/>
<ClCompile
Include=
"..\libavformat\srtpproto.c"
/>
<ClCompile
Include=
"..\libavformat\srtpproto.c"
/>
<ClCompile
Include=
"..\libavformat\subfile.c"
/>
<ClCompile
Include=
"..\libavformat\subfile.c"
/>
<ClCompile
Include=
"..\libavformat\teeproto.c"
/>
<ClCompile
Include=
"..\libavformat\teeproto.c"
/>
...
...
SMP/libavformat.vcxproj.filters
浏览文件 @
c3fd4674
...
@@ -1393,6 +1393,9 @@
...
@@ -1393,6 +1393,9 @@
<ClCompile
Include=
"..\libavformat\rtpproto.c"
>
<ClCompile
Include=
"..\libavformat\rtpproto.c"
>
<Filter>
Source Files\libavformat
</Filter>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
</ClCompile>
<ClCompile
Include=
"..\libavformat\ip.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\srtpproto.c"
>
<ClCompile
Include=
"..\libavformat\srtpproto.c"
>
<Filter>
Source Files\libavformat
</Filter>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
</ClCompile>
...
...
SMP/libavutil/ffversion.h
浏览文件 @
c3fd4674
...
@@ -21,5 +21,5 @@
...
@@ -21,5 +21,5 @@
#ifndef SMP_LIBAVUTIL_FFVERSION_H
#ifndef SMP_LIBAVUTIL_FFVERSION_H
#define SMP_LIBAVUTIL_FFVERSION_H
#define SMP_LIBAVUTIL_FFVERSION_H
#define FFMPEG_VERSION "
3.4
.git"
#define FFMPEG_VERSION "
4.0
.git"
#endif
/* SMP_LIBAVUTIL_FFVERSION_H */
#endif
/* SMP_LIBAVUTIL_FFVERSION_H */
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录