Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
3f1a9400
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,发现更多精彩内容 >>
提交
3f1a9400
编写于
4月 10, 2017
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
projects: Update for recent upstream merge.
上级
48028408
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
72 addition
and
40 deletion
+72
-40
SMP/config.asm
SMP/config.asm
+14
-14
SMP/config.h
SMP/config.h
+14
-14
SMP/libavcodec.vcxproj
SMP/libavcodec.vcxproj
+8
-3
SMP/libavcodec.vcxproj.filters
SMP/libavcodec.vcxproj.filters
+24
-9
SMP/libavcodec/dce_defs.c
SMP/libavcodec/dce_defs.c
+6
-0
SMP/libavformat.vcxproj
SMP/libavformat.vcxproj
+1
-0
SMP/libavformat.vcxproj.filters
SMP/libavformat.vcxproj.filters
+3
-0
SMP/libavutil.def
SMP/libavutil.def
+2
-0
未找到文件。
SMP/config.asm
浏览文件 @
3f1a9400
...
...
@@ -405,8 +405,6 @@
%define HAVE_DXVA2_LIB 1
%define HAVE_DXVA2API_COBJ 1
%define HAVE_LIBC_MSVCRT 1
%define HAVE_LIBDC1394_1 0
%define HAVE_LIBDC1394_2 0
%define HAVE_MAKEINFO 0
%define HAVE_MAKEINFO_HTML 0
%define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
...
...
@@ -420,18 +418,6 @@
%define HAVE_VAAPI_X11 0
%define HAVE_VDPAU_X11 0
%define HAVE_WINRT 0
%define HAVE_XLIB 0
%define CONFIG_BSFS 1
%define CONFIG_DECODERS 1
%define CONFIG_ENCODERS 1
%define CONFIG_HWACCELS 1
%define CONFIG_PARSERS 1
%define CONFIG_INDEVS 1
%define CONFIG_OUTDEVS 1
%define CONFIG_FILTERS 1
%define CONFIG_DEMUXERS 1
%define CONFIG_MUXERS 1
%define CONFIG_PROTOCOLS 1
%define CONFIG_DOC 0
%define CONFIG_HTMLPAGES 0
%define CONFIG_MANPAGES 0
...
...
@@ -603,6 +589,17 @@
%define CONFIG_THUMB 0
%define CONFIG_VALGRIND_BACKTRACE 0
%define CONFIG_XMM_CLOBBER_TEST 0
%define CONFIG_BSFS 1
%define CONFIG_DECODERS 1
%define CONFIG_ENCODERS 1
%define CONFIG_HWACCELS 1
%define CONFIG_PARSERS 1
%define CONFIG_INDEVS 1
%define CONFIG_OUTDEVS 1
%define CONFIG_FILTERS 1
%define CONFIG_DEMUXERS 1
%define CONFIG_MUXERS 1
%define CONFIG_PROTOCOLS 1
%define CONFIG_AANDCTTABLES 1
%define CONFIG_AC3DSP 1
%define CONFIG_AUDIO_FRAME_QUEUE 1
...
...
@@ -628,6 +625,7 @@
%define CONFIG_H264PARSE 1
%define CONFIG_H264PRED 1
%define CONFIG_H264QPEL 1
%define CONFIG_HEVCPARSE 1
%define CONFIG_HPELDSP 1
%define CONFIG_HUFFMAN 1
%define CONFIG_HUFFYUVDSP 1
...
...
@@ -650,6 +648,7 @@
%define CONFIG_MPEG_ER 1
%define CONFIG_MPEGAUDIO 1
%define CONFIG_MPEGAUDIODSP 1
%define CONFIG_MPEGAUDIOHEADER 1
%define CONFIG_MPEGVIDEO 1
%define CONFIG_MPEGVIDEOENC 1
%define CONFIG_MSS34DSP 1
...
...
@@ -921,6 +920,7 @@
%define CONFIG_VP8_DECODER 1
%define CONFIG_VP9_DECODER 1
%define CONFIG_VQA_DECODER 1
%define CONFIG_BITPACKED_DECODER 1
%define CONFIG_WEBP_DECODER 1
%define CONFIG_WMV1_DECODER 1
%define CONFIG_WMV2_DECODER 1
...
...
SMP/config.h
浏览文件 @
3f1a9400
...
...
@@ -447,8 +447,6 @@
#define HAVE_DXVA2_LIB 1
#define HAVE_DXVA2API_COBJ 1
#define HAVE_LIBC_MSVCRT 1
#define HAVE_LIBDC1394_1 0
#define HAVE_LIBDC1394_2 0
#define HAVE_MAKEINFO 0
#define HAVE_MAKEINFO_HTML 0
#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
...
...
@@ -462,18 +460,6 @@
#define HAVE_VAAPI_X11 0
#define HAVE_VDPAU_X11 0
#define HAVE_WINRT 0
#define HAVE_XLIB 0
#define CONFIG_BSFS 1
#define CONFIG_DECODERS 1
#define CONFIG_ENCODERS 1
#define CONFIG_HWACCELS 1
#define CONFIG_PARSERS 1
#define CONFIG_INDEVS 1
#define CONFIG_OUTDEVS 1
#define CONFIG_FILTERS 1
#define CONFIG_DEMUXERS 1
#define CONFIG_MUXERS 1
#define CONFIG_PROTOCOLS 1
#define CONFIG_DOC 0
#define CONFIG_HTMLPAGES 0
#define CONFIG_MANPAGES 0
...
...
@@ -658,6 +644,17 @@
#define CONFIG_THUMB 0
#define CONFIG_VALGRIND_BACKTRACE 0
#define CONFIG_XMM_CLOBBER_TEST 0
#define CONFIG_BSFS 1
#define CONFIG_DECODERS 1
#define CONFIG_ENCODERS 1
#define CONFIG_HWACCELS 1
#define CONFIG_PARSERS 1
#define CONFIG_INDEVS 1
#define CONFIG_OUTDEVS 1
#define CONFIG_FILTERS 1
#define CONFIG_DEMUXERS 1
#define CONFIG_MUXERS 1
#define CONFIG_PROTOCOLS 1
#define CONFIG_AANDCTTABLES 1
#define CONFIG_AC3DSP 1
#define CONFIG_AUDIO_FRAME_QUEUE 1
...
...
@@ -683,6 +680,7 @@
#define CONFIG_H264PARSE 1
#define CONFIG_H264PRED 1
#define CONFIG_H264QPEL 1
#define CONFIG_HEVCPARSE 1
#define CONFIG_HPELDSP 1
#define CONFIG_HUFFMAN 1
#define CONFIG_HUFFYUVDSP 1
...
...
@@ -705,6 +703,7 @@
#define CONFIG_MPEG_ER 1
#define CONFIG_MPEGAUDIO 1
#define CONFIG_MPEGAUDIODSP 1
#define CONFIG_MPEGAUDIOHEADER 1
#define CONFIG_MPEGVIDEO 1
#define CONFIG_MPEGVIDEOENC 1
#define CONFIG_MSS34DSP 1
...
...
@@ -976,6 +975,7 @@
#define CONFIG_VP8_DECODER 1
#define CONFIG_VP9_DECODER 1
#define CONFIG_VQA_DECODER 1
#define CONFIG_BITPACKED_DECODER 1
#define CONFIG_WEBP_DECODER 1
#define CONFIG_WMV1_DECODER 1
#define CONFIG_WMV2_DECODER 1
...
...
SMP/libavcodec.vcxproj
浏览文件 @
3f1a9400
...
...
@@ -118,6 +118,7 @@
<YASM
Include=
"..\libavcodec\x86\g722dsp.asm"
/>
<YASM
Include=
"..\libavcodec\x86\alacdsp.asm"
/>
<YASM
Include=
"..\libavcodec\x86\pngdsp.asm"
/>
<YASM
Include=
"..\libavcodec\x86\cavsidct.asm"
/>
<YASM
Include=
"..\libavcodec\x86\dcadsp.asm"
/>
<YASM
Include=
"..\libavcodec\x86\synth_filter.asm"
/>
<YASM
Include=
"..\libavcodec\x86\diracdsp.asm"
/>
...
...
@@ -166,8 +167,10 @@
<ClCompile
Include=
"..\libavcodec\bsf.c"
/>
<ClCompile
Include=
"..\libavcodec\codec_desc.c"
/>
<ClCompile
Include=
"..\libavcodec\d3d11va.c"
/>
<ClCompile
Include=
"..\libavcodec\decode.c"
/>
<ClCompile
Include=
"..\libavcodec\dirac.c"
/>
<ClCompile
Include=
"..\libavcodec\dv_profile.c"
/>
<ClCompile
Include=
"..\libavcodec\encode.c"
/>
<ClCompile
Include=
"..\libavcodec\imgconvert.c"
/>
<ClCompile
Include=
"..\libavcodec\jni.c"
/>
<ClCompile
Include=
"..\libavcodec\mathtables.c"
/>
...
...
@@ -213,6 +216,8 @@
<ClCompile
Include=
"..\libavcodec\h264_ps.c"
/>
<ClCompile
Include=
"..\libavcodec\h264pred.c"
/>
<ClCompile
Include=
"..\libavcodec\h264qpel.c"
/>
<ClCompile
Include=
"..\libavcodec\hevc_parse.c"
/>
<ClCompile
Include=
"..\libavcodec\hevc_ps.c"
/>
<ClCompile
Include=
"..\libavcodec\huffman.c"
/>
<ClCompile
Include=
"..\libavcodec\simple_idct.c"
/>
<ClCompile
Include=
"..\libavcodec\jrevdct.c"
/>
...
...
@@ -231,12 +236,12 @@
<ClCompile
Include=
"..\libavcodec\mdct_fixed_32.c"
/>
<ClCompile
Include=
"..\libavcodec\mpeg_er.c"
/>
<ClCompile
Include=
"..\libavcodec\mpegaudio.c"
/>
<ClCompile
Include=
"..\libavcodec\mpegaudiodata.c"
/>
<ClCompile
Include=
"..\libavcodec\mpegaudiodecheader.c"
/>
<ClCompile
Include=
"..\libavcodec\mpegaudiodsp.c"
/>
<ClCompile
Include=
"..\libavcodec\mpegaudiodsp_data.c"
/>
<ClCompile
Include=
"..\libavcodec\mpegaudiodsp_fixed.c"
/>
<ClCompile
Include=
"..\libavcodec\mpegaudiodsp_float.c"
/>
<ClCompile
Include=
"..\libavcodec\mpegaudiodecheader.c"
/>
<ClCompile
Include=
"..\libavcodec\mpegaudiodata.c"
/>
<ClCompile
Include=
"..\libavcodec\mpegvideo.c"
/>
<ClCompile
Include=
"..\libavcodec\mpegvideodsp.c"
/>
<ClCompile
Include=
"..\libavcodec\rl.c"
/>
...
...
@@ -357,6 +362,7 @@
<ClCompile
Include=
"..\libavcodec\binkdsp.c"
/>
<ClCompile
Include=
"..\libavcodec\binkaudio.c"
/>
<ClCompile
Include=
"..\libavcodec\bintext.c"
/>
<ClCompile
Include=
"..\libavcodec\bitpacked.c"
/>
<ClCompile
Include=
"..\libavcodec\bmp.c"
/>
<ClCompile
Include=
"..\libavcodec\bmpenc.c"
/>
<ClCompile
Include=
"..\libavcodec\bmvaudio.c"
/>
...
...
@@ -503,7 +509,6 @@
<ClCompile
Include=
"..\libavcodec\hap.c"
/>
<ClCompile
Include=
"..\libavcodec\hevcdec.c"
/>
<ClCompile
Include=
"..\libavcodec\hevc_mvs.c"
/>
<ClCompile
Include=
"..\libavcodec\hevc_ps.c"
/>
<ClCompile
Include=
"..\libavcodec\hevc_sei.c"
/>
<ClCompile
Include=
"..\libavcodec\hevc_cabac.c"
/>
<ClCompile
Include=
"..\libavcodec\hevc_refs.c"
/>
...
...
SMP/libavcodec.vcxproj.filters
浏览文件 @
3f1a9400
...
...
@@ -181,6 +181,9 @@
<YASM
Include=
"..\libavcodec\x86\pngdsp.asm"
>
<Filter>
Source Files\libavcodec\x86
</Filter>
</YASM>
<YASM
Include=
"..\libavcodec\x86\cavsidct.asm"
>
<Filter>
Source Files\libavcodec\x86
</Filter>
</YASM>
<YASM
Include=
"..\libavcodec\x86\dcadsp.asm"
>
<Filter>
Source Files\libavcodec\x86
</Filter>
</YASM>
...
...
@@ -321,12 +324,18 @@
<ClCompile
Include=
"..\libavcodec\d3d11va.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\decode.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\dirac.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\dv_profile.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\encode.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\imgconvert.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
@@ -462,6 +471,12 @@
<ClCompile
Include=
"..\libavcodec\h264qpel.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\hevc_parse.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\hevc_ps.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\huffman.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
@@ -516,12 +531,6 @@
<ClCompile
Include=
"..\libavcodec\mpegaudio.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\mpegaudiodata.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\mpegaudiodecheader.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\mpegaudiodsp.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
@@ -534,6 +543,12 @@
<ClCompile
Include=
"..\libavcodec\mpegaudiodsp_float.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\mpegaudiodecheader.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\mpegaudiodata.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\mpegvideo.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
@@ -894,6 +909,9 @@
<ClCompile
Include=
"..\libavcodec\bintext.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\bitpacked.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\bmp.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
@@ -1332,9 +1350,6 @@
<ClCompile
Include=
"..\libavcodec\hevc_mvs.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\hevc_ps.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\hevc_sei.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
SMP/libavcodec/dce_defs.c
浏览文件 @
3f1a9400
...
...
@@ -3538,12 +3538,18 @@ void ff_simple_idct12_sse2(int16_t *block) {return;}
#if !(HAVE_MMX_INLINE)
void
ff_simple_idct_add_mmx
(
uint8_t
*
dest
,
ptrdiff_t
line_size
,
int16_t
*
block
)
{
return
;}
#endif
#if !(HAVE_SSE2_INLINE)
void
ff_simple_idct_add_sse2
(
uint8_t
*
dest
,
ptrdiff_t
line_size
,
int16_t
*
block
)
{
return
;}
#endif
#if !(HAVE_MMX_INLINE)
void
ff_simple_idct_mmx
(
int16_t
*
block
)
{
return
;}
#endif
#if !(HAVE_MMX_INLINE)
void
ff_simple_idct_put_mmx
(
uint8_t
*
dest
,
ptrdiff_t
line_size
,
int16_t
*
block
)
{
return
;}
#endif
#if !(HAVE_SSE2_INLINE)
void
ff_simple_idct_put_sse2
(
uint8_t
*
dest
,
ptrdiff_t
line_size
,
int16_t
*
block
)
{
return
;}
#endif
void
ff_svq1enc_init_ppc
(
SVQ1EncContext
*
c
)
{
return
;}
void
ff_synth_filter_init_aarch64
(
SynthFilterContext
*
c
)
{
return
;}
void
ff_synth_filter_init_arm
(
SynthFilterContext
*
c
)
{
return
;}
...
...
SMP/libavformat.vcxproj
浏览文件 @
3f1a9400
...
...
@@ -115,6 +115,7 @@
<ClCompile
Include=
"..\libavformat\rtpdec_qcelp.c"
/>
<ClCompile
Include=
"..\libavformat\rtpdec_qdm2.c"
/>
<ClCompile
Include=
"..\libavformat\rtpdec_qt.c"
/>
<ClCompile
Include=
"..\libavformat\rtpdec_rfc4175.c"
/>
<ClCompile
Include=
"..\libavformat\rtpdec_svq3.c"
/>
<ClCompile
Include=
"..\libavformat\rtpdec_vc2hq.c"
/>
<ClCompile
Include=
"..\libavformat\rtpdec_vp8.c"
/>
...
...
SMP/libavformat.vcxproj.filters
浏览文件 @
3f1a9400
...
...
@@ -169,6 +169,9 @@
<ClCompile
Include=
"..\libavformat\rtpdec_qt.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\rtpdec_rfc4175.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavformat\rtpdec_svq3.c"
>
<Filter>
Source Files\libavformat
</Filter>
</ClCompile>
...
...
SMP/libavutil.def
浏览文件 @
3f1a9400
...
...
@@ -79,6 +79,8 @@ EXPORTS
av_color_transfer_name
av_compare_mod
av_compare_ts
av_content_light_metadata_alloc
av_content_light_metadata_create_side_data
av_cpu_count
av_crc
av_crc_get_table
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录