Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
3b5bea0e
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,发现更多精彩内容 >>
提交
3b5bea0e
编写于
6月 07, 2020
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
projects: Update for recent upstream merge.
上级
e189be66
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
44 addition
and
3 deletion
+44
-3
SMP/SMP.patch
SMP/SMP.patch
+3
-3
SMP/config.asm
SMP/config.asm
+5
-0
SMP/config.h
SMP/config.h
+5
-0
SMP/libavcodec.vcxproj
SMP/libavcodec.vcxproj
+12
-0
SMP/libavcodec.vcxproj.filters
SMP/libavcodec.vcxproj.filters
+6
-0
SMP/libavcodec/codec_list.c
SMP/libavcodec/codec_list.c
+2
-0
SMP/libavcodec/parser_list.c
SMP/libavcodec/parser_list.c
+1
-0
SMP/libavfilter.vcxproj
SMP/libavfilter.vcxproj
+2
-0
SMP/libavfilter.vcxproj.filters
SMP/libavfilter.vcxproj.filters
+6
-0
SMP/libavfilter/filter_list.c
SMP/libavfilter/filter_list.c
+1
-0
SMP/libavformat/muxer_list.c
SMP/libavformat/muxer_list.c
+1
-0
未找到文件。
SMP/SMP.patch
浏览文件 @
3b5bea0e
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index
4121b2807a..53f847a0f
e 100644
index
d4b1fd0d53..67d161899
e 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -30,10 +30,6 @@
#include "avcodec.h"
@@ -31,10 +31,6 @@
#include "internal.h"
#include "packet_internal.h"
-#if defined(_MSC_VER)
-#define X264_API_IMPORTS 1
...
...
SMP/config.asm
浏览文件 @
3b5bea0e
...
...
@@ -913,6 +913,7 @@
%define CONFIG_PAM_DECODER 1
%define CONFIG_PBM_DECODER 1
%define CONFIG_PCX_DECODER 1
%define CONFIG_PFM_DECODER 1
%define CONFIG_PGM_DECODER 1
%define CONFIG_PGMYUV_DECODER 1
%define CONFIG_PICTOR_DECODER 1
...
...
@@ -1427,6 +1428,7 @@
%define CONFIG_ADPCM_G726_ENCODER 1
%define CONFIG_ADPCM_G726LE_ENCODER 1
%define CONFIG_ADPCM_IMA_QT_ENCODER 1
%define CONFIG_ADPCM_IMA_SSI_ENCODER 1
%define CONFIG_ADPCM_IMA_WAV_ENCODER 1
%define CONFIG_ADPCM_MS_ENCODER 1
%define CONFIG_ADPCM_SWF_ENCODER 1
...
...
@@ -1589,6 +1591,7 @@
%define CONFIG_H263_PARSER 1
%define CONFIG_H264_PARSER 1
%define CONFIG_HEVC_PARSER 1
%define CONFIG_JPEG2000_PARSER 1
%define CONFIG_MJPEG_PARSER 1
%define CONFIG_MLP_PARSER 1
%define CONFIG_MPEG4VIDEO_PARSER 1
...
...
@@ -1809,6 +1812,7 @@
%define CONFIG_CUE_FILTER 1
%define CONFIG_CURVES_FILTER 1
%define CONFIG_DATASCOPE_FILTER 1
%define CONFIG_DBLUR_FILTER 1
%define CONFIG_DCTDNOIZ_FILTER 1
%define CONFIG_DEBAND_FILTER 1
%define CONFIG_DEBLOCK_FILTER 1
...
...
@@ -2476,6 +2480,7 @@
%define CONFIG_ISMV_MUXER 1
%define CONFIG_IVF_MUXER 1
%define CONFIG_JACOSUB_MUXER 1
%define CONFIG_KVAG_MUXER 1
%define CONFIG_LATM_MUXER 1
%define CONFIG_LRC_MUXER 1
%define CONFIG_M4V_MUXER 1
...
...
SMP/config.h
浏览文件 @
3b5bea0e
...
...
@@ -983,6 +983,7 @@
#define CONFIG_PAM_DECODER 1
#define CONFIG_PBM_DECODER 1
#define CONFIG_PCX_DECODER 1
#define CONFIG_PFM_DECODER 1
#define CONFIG_PGM_DECODER 1
#define CONFIG_PGMYUV_DECODER 1
#define CONFIG_PICTOR_DECODER 1
...
...
@@ -1497,6 +1498,7 @@
#define CONFIG_ADPCM_G726_ENCODER 1
#define CONFIG_ADPCM_G726LE_ENCODER 1
#define CONFIG_ADPCM_IMA_QT_ENCODER 1
#define CONFIG_ADPCM_IMA_SSI_ENCODER 1
#define CONFIG_ADPCM_IMA_WAV_ENCODER 1
#define CONFIG_ADPCM_MS_ENCODER 1
#define CONFIG_ADPCM_SWF_ENCODER 1
...
...
@@ -1711,6 +1713,7 @@
#define CONFIG_H263_PARSER 1
#define CONFIG_H264_PARSER 1
#define CONFIG_HEVC_PARSER 1
#define CONFIG_JPEG2000_PARSER 1
#define CONFIG_MJPEG_PARSER 1
#define CONFIG_MLP_PARSER 1
#define CONFIG_MPEG4VIDEO_PARSER 1
...
...
@@ -1931,6 +1934,7 @@
#define CONFIG_CUE_FILTER 1
#define CONFIG_CURVES_FILTER 1
#define CONFIG_DATASCOPE_FILTER 1
#define CONFIG_DBLUR_FILTER 1
#define CONFIG_DCTDNOIZ_FILTER 1
#define CONFIG_DEBAND_FILTER 1
#define CONFIG_DEBLOCK_FILTER 1
...
...
@@ -2598,6 +2602,7 @@
#define CONFIG_ISMV_MUXER 1
#define CONFIG_IVF_MUXER 1
#define CONFIG_JACOSUB_MUXER 1
#define CONFIG_KVAG_MUXER 1
#define CONFIG_LATM_MUXER 1
#define CONFIG_LRC_MUXER 1
#define CONFIG_M4V_MUXER 1
...
...
SMP/libavcodec.vcxproj
浏览文件 @
3b5bea0e
...
...
@@ -927,6 +927,7 @@
<ClCompile
Include=
"..\libavcodec\h263_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\h264_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\hevc_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\jpeg2000_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\mjpeg_parser.c"
/>
<ClCompile
Include=
"..\libavcodec\mlp_parse.c"
/>
<ClCompile
Include=
"..\libavcodec\mlp_parser.c"
/>
...
...
@@ -1233,6 +1234,7 @@
<ClInclude
Include=
"..\libavcodec\avdct.h"
/>
<ClInclude
Include=
"..\libavcodec\avfft.h"
/>
<ClInclude
Include=
"..\libavcodec\bsf.h"
/>
<ClInclude
Include=
"..\libavcodec\codec.h"
/>
<ClInclude
Include=
"..\libavcodec\codec_desc.h"
/>
<ClInclude
Include=
"..\libavcodec\codec_id.h"
/>
<ClInclude
Include=
"..\libavcodec\codec_par.h"
/>
...
...
@@ -1479,6 +1481,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
...
...
@@ -1567,6 +1570,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
...
...
@@ -1662,6 +1666,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
...
...
@@ -1755,6 +1760,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
...
...
@@ -1849,6 +1855,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
...
...
@@ -1941,6 +1948,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
...
...
@@ -2041,6 +2049,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
...
...
@@ -2140,6 +2149,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
...
...
@@ -2240,6 +2250,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
...
...
@@ -2339,6 +2350,7 @@ copy ..\libavcodec\avcodec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avdct.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\avfft.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\bsf.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_desc.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_id.h "$(OutDir)"\include\libavcodec
copy ..\libavcodec\codec_par.h "$(OutDir)"\include\libavcodec
...
...
SMP/libavcodec.vcxproj.filters
浏览文件 @
3b5bea0e
...
...
@@ -2631,6 +2631,9 @@
<ClCompile
Include=
"..\libavcodec\hevc_parser.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\jpeg2000_parser.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\mjpeg_parser.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
@@ -3221,6 +3224,9 @@
<ClInclude
Include=
"..\libavcodec\bsf.h"
>
<Filter>
Header Files\libavcodec
</Filter>
</ClInclude>
<ClInclude
Include=
"..\libavcodec\codec.h"
>
<Filter>
Header Files\libavcodec
</Filter>
</ClInclude>
<ClInclude
Include=
"..\libavcodec\codec_desc.h"
>
<Filter>
Header Files\libavcodec
</Filter>
</ClInclude>
...
...
SMP/libavcodec/codec_list.c
浏览文件 @
3b5bea0e
...
...
@@ -159,6 +159,7 @@ static const AVCodec *codec_list[] = {
&
ff_adpcm_g726_encoder
,
&
ff_adpcm_g726le_encoder
,
&
ff_adpcm_ima_qt_encoder
,
&
ff_adpcm_ima_ssi_encoder
,
&
ff_adpcm_ima_wav_encoder
,
&
ff_adpcm_ms_encoder
,
&
ff_adpcm_swf_encoder
,
...
...
@@ -346,6 +347,7 @@ static const AVCodec *codec_list[] = {
&
ff_pam_decoder
,
&
ff_pbm_decoder
,
&
ff_pcx_decoder
,
&
ff_pfm_decoder
,
&
ff_pgm_decoder
,
&
ff_pgmyuv_decoder
,
&
ff_pictor_decoder
,
...
...
SMP/libavcodec/parser_list.c
浏览文件 @
3b5bea0e
...
...
@@ -45,6 +45,7 @@ static const AVCodecParser *parser_list[] = {
&
ff_h263_parser
,
&
ff_h264_parser
,
&
ff_hevc_parser
,
&
ff_jpeg2000_parser
,
&
ff_mjpeg_parser
,
&
ff_mlp_parser
,
&
ff_mpeg4video_parser
,
...
...
SMP/libavfilter.vcxproj
浏览文件 @
3b5bea0e
...
...
@@ -248,6 +248,7 @@
<ClCompile
Include=
"..\libavfilter\vf_cropdetect.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_curves.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_datascope.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_dblur.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_dctdnoiz.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_deband.c"
/>
<ClCompile
Include=
"..\libavfilter\vf_deblock.c"
/>
...
...
@@ -419,6 +420,7 @@
<ClCompile
Include=
"..\libavfilter\dnn\dnn_backend_native_layer_depth2space.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_backend_native_layer_maximum.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_backend_native_layer_mathbinary.c"
/>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_backend_native_layer_mathunary.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\scene_sad_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\af_afir_init.c"
/>
<ClCompile
Include=
"..\libavfilter\x86\af_anlmdn_init.c"
/>
...
...
SMP/libavfilter.vcxproj.filters
浏览文件 @
3b5bea0e
...
...
@@ -597,6 +597,9 @@
<ClCompile
Include=
"..\libavfilter\vf_datascope.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_dblur.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\vf_dctdnoiz.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
@@ -1110,6 +1113,9 @@
<ClCompile
Include=
"..\libavfilter\dnn\dnn_backend_native_layer_mathbinary.c"
>
<Filter>
Source Files\libavfilter\dnn
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\dnn\dnn_backend_native_layer_mathunary.c"
>
<Filter>
Source Files\libavfilter\dnn
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\x86\scene_sad_init.c"
>
<Filter>
Source Files\libavfilter\x86
</Filter>
</ClCompile>
...
...
SMP/libavfilter/filter_list.c
浏览文件 @
3b5bea0e
...
...
@@ -171,6 +171,7 @@ static const AVFilter *filter_list[] = {
&
ff_vf_cue
,
&
ff_vf_curves
,
&
ff_vf_datascope
,
&
ff_vf_dblur
,
&
ff_vf_dctdnoiz
,
&
ff_vf_deband
,
&
ff_vf_deblock
,
...
...
SMP/libavformat/muxer_list.c
浏览文件 @
3b5bea0e
...
...
@@ -84,6 +84,7 @@ static const AVOutputFormat *muxer_list[] = {
&
ff_ismv_muxer
,
&
ff_ivf_muxer
,
&
ff_jacosub_muxer
,
&
ff_kvag_muxer
,
&
ff_latm_muxer
,
&
ff_lrc_muxer
,
&
ff_m4v_muxer
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录