Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
41740e0f
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,发现更多精彩内容 >>
提交
41740e0f
编写于
6月 04, 2017
作者:
M
Matt Oliver
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
project: Update for recent upstream merge.
上级
bdbbf734
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
17 addition
and
42 deletion
+17
-42
SMP/config.asm
SMP/config.asm
+1
-6
SMP/config.h
SMP/config.h
+1
-6
SMP/libavcodec.vcxproj
SMP/libavcodec.vcxproj
+4
-4
SMP/libavcodec.vcxproj.filters
SMP/libavcodec.vcxproj.filters
+6
-6
SMP/libavcodec/dce_defs.c
SMP/libavcodec/dce_defs.c
+1
-18
SMP/libavfilter.vcxproj
SMP/libavfilter.vcxproj
+1
-0
SMP/libavfilter.vcxproj.filters
SMP/libavfilter.vcxproj.filters
+3
-0
SMP/libavformat/dce_defs.c
SMP/libavformat/dce_defs.c
+0
-2
未找到文件。
SMP/config.asm
浏览文件 @
41740e0f
...
...
@@ -500,7 +500,6 @@
%define CONFIG_LIBKVAZAAR 0
%define CONFIG_LIBMODPLUG 1
%define CONFIG_LIBMP3LAME 1
%define CONFIG_LIBNUT 0
%define CONFIG_LIBOPENCV 0
%define CONFIG_LIBOPENH264 0
%define CONFIG_LIBOPENJPEG 0
...
...
@@ -509,7 +508,6 @@
%define CONFIG_LIBPULSE 0
%define CONFIG_LIBRSVG 0
%define CONFIG_LIBRTMP 0
%define CONFIG_LIBSCHROEDINGER 0
%define CONFIG_LIBSHINE 0
%define CONFIG_LIBSMBCLIENT 0
%define CONFIG_LIBSNAPPY 0
...
...
@@ -1164,7 +1162,6 @@
%define CONFIG_LIBOPENJPEG_DECODER 0
%define CONFIG_LIBOPUS_DECODER 0
%define CONFIG_LIBRSVG_DECODER 0
%define CONFIG_LIBSCHROEDINGER_DECODER 0
%define CONFIG_LIBSPEEX_DECODER 1
%define CONFIG_LIBVORBIS_DECODER 1
%define CONFIG_LIBVPX_VP8_DECODER 0
...
...
@@ -1463,7 +1460,6 @@
%define CONFIG_IMAGE_XPM_PIPE_DEMUXER 1
%define CONFIG_LIBGME_DEMUXER 1
%define CONFIG_LIBMODPLUG_DEMUXER 1
%define CONFIG_LIBNUT_DEMUXER 0
%define CONFIG_LIBOPENMPT_DEMUXER 0
%define CONFIG_A64MULTI_ENCODER 1
%define CONFIG_A64MULTI5_ENCODER 1
...
...
@@ -1625,7 +1621,6 @@
%define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
%define CONFIG_LIBOPENJPEG_ENCODER 0
%define CONFIG_LIBOPUS_ENCODER 1
%define CONFIG_LIBSCHROEDINGER_ENCODER 0
%define CONFIG_LIBSHINE_ENCODER 0
%define CONFIG_LIBSPEEX_ENCODER 1
%define CONFIG_LIBTHEORA_ENCODER 1
...
...
@@ -1741,6 +1736,7 @@
%define CONFIG_SOFALIZER_FILTER 0
%define CONFIG_STEREOTOOLS_FILTER 1
%define CONFIG_STEREOWIDEN_FILTER 1
%define CONFIG_SURROUND_FILTER 1
%define CONFIG_TREBLE_FILTER 1
%define CONFIG_TREMOLO_FILTER 1
%define CONFIG_VIBRATO_FILTER 1
...
...
@@ -2216,7 +2212,6 @@
%define CONFIG_WV_MUXER 1
%define CONFIG_YUV4MPEGPIPE_MUXER 1
%define CONFIG_CHROMAPRINT_MUXER 0
%define CONFIG_LIBNUT_MUXER 0
%define CONFIG_ALSA_OUTDEV 0
%define CONFIG_CACA_OUTDEV 0
%define CONFIG_DECKLINK_OUTDEV 0
...
...
SMP/config.h
浏览文件 @
41740e0f
...
...
@@ -542,7 +542,6 @@
#define CONFIG_LIBKVAZAAR 0
#define CONFIG_LIBMODPLUG 1
#define CONFIG_LIBMP3LAME 1
#define CONFIG_LIBNUT 0
#define CONFIG_LIBOPENCV 0
#define CONFIG_LIBOPENH264 0
#define CONFIG_LIBOPENJPEG 0
...
...
@@ -551,7 +550,6 @@
#define CONFIG_LIBPULSE 0
#define CONFIG_LIBRSVG 0
#define CONFIG_LIBRTMP 0
#define CONFIG_LIBSCHROEDINGER 0
#define CONFIG_LIBSHINE 0
#define CONFIG_LIBSMBCLIENT 0
#define CONFIG_LIBSNAPPY 0
...
...
@@ -1221,7 +1219,6 @@
#define CONFIG_LIBOPENJPEG_DECODER 0
#define CONFIG_LIBOPUS_DECODER 0
#define CONFIG_LIBRSVG_DECODER 0
#define CONFIG_LIBSCHROEDINGER_DECODER 0
#define CONFIG_LIBSPEEX_DECODER 1
#define CONFIG_LIBVORBIS_DECODER 1
#define CONFIG_LIBVPX_VP8_DECODER 0
...
...
@@ -1520,7 +1517,6 @@
#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 1
#define CONFIG_LIBGME_DEMUXER 1
#define CONFIG_LIBMODPLUG_DEMUXER 1
#define CONFIG_LIBNUT_DEMUXER 0
#define CONFIG_LIBOPENMPT_DEMUXER 0
#define CONFIG_A64MULTI_ENCODER 1
#define CONFIG_A64MULTI5_ENCODER 1
...
...
@@ -1682,7 +1678,6 @@
#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
#define CONFIG_LIBOPENJPEG_ENCODER 0
#define CONFIG_LIBOPUS_ENCODER 1
#define CONFIG_LIBSCHROEDINGER_ENCODER 0
#define CONFIG_LIBSHINE_ENCODER 0
#define CONFIG_LIBSPEEX_ENCODER 1
#define CONFIG_LIBTHEORA_ENCODER 1
...
...
@@ -1798,6 +1793,7 @@
#define CONFIG_SOFALIZER_FILTER 0
#define CONFIG_STEREOTOOLS_FILTER 1
#define CONFIG_STEREOWIDEN_FILTER 1
#define CONFIG_SURROUND_FILTER 1
#define CONFIG_TREBLE_FILTER 1
#define CONFIG_TREMOLO_FILTER 1
#define CONFIG_VIBRATO_FILTER 1
...
...
@@ -2287,7 +2283,6 @@
#define CONFIG_WV_MUXER 1
#define CONFIG_YUV4MPEGPIPE_MUXER 1
#define CONFIG_CHROMAPRINT_MUXER 0
#define CONFIG_LIBNUT_MUXER 0
#define CONFIG_ALSA_OUTDEV 0
#define CONFIG_CACA_OUTDEV 0
#define CONFIG_DECKLINK_OUTDEV 0
...
...
SMP/libavcodec.vcxproj
浏览文件 @
41740e0f
...
...
@@ -108,6 +108,7 @@
<YASM
Include=
"..\libavcodec\x86\vc1dsp_loopfilter.asm"
/>
<YASM
Include=
"..\libavcodec\x86\vc1dsp_mc.asm"
/>
<YASM
Include=
"..\libavcodec\x86\simple_idct10.asm"
/>
<YASM
Include=
"..\libavcodec\x86\simple_idct.asm"
/>
<YASM
Include=
"..\libavcodec\x86\videodsp.asm"
/>
<YASM
Include=
"..\libavcodec\x86\vp3dsp.asm"
/>
<YASM
Include=
"..\libavcodec\x86\vp8dsp.asm"
/>
...
...
@@ -220,7 +221,6 @@
<ClCompile
Include=
"..\libavcodec\hevc_ps.c"
/>
<ClCompile
Include=
"..\libavcodec\hevc_sei.c"
/>
<ClCompile
Include=
"..\libavcodec\huffman.c"
/>
<ClCompile
Include=
"..\libavcodec\simple_idct.c"
/>
<ClCompile
Include=
"..\libavcodec\jrevdct.c"
/>
<ClCompile
Include=
"..\libavcodec\iirfilter.c"
/>
<ClCompile
Include=
"..\libavcodec\mdct15.c"
/>
...
...
@@ -1008,6 +1008,9 @@
<ClCompile
Include=
"..\libavcodec\idctdsp.c"
>
<ObjectFileName>
$(IntDir)\libavcodec_idctdsp.obj
</ObjectFileName>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\simple_idct.c"
>
<ObjectFileName>
$(IntDir)\libavcodec_simple_idct.obj
</ObjectFileName>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\lossless_audiodsp.c"
>
<ObjectFileName>
$(IntDir)\libavcodec_lossless_audiodsp.obj
</ObjectFileName>
</ClCompile>
...
...
@@ -1122,9 +1125,6 @@
<ClCompile
Include=
"..\libavcodec\x86\cavsdsp.c"
>
<ObjectFileName>
$(IntDir)\libavcodec_x86_cavsdsp.obj
</ObjectFileName>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\x86\simple_idct.c"
>
<ObjectFileName>
$(IntDir)\libavcodec_x86_simple_idct.obj
</ObjectFileName>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude
Include=
"..\libavcodec\avcodec.h"
/>
...
...
SMP/libavcodec.vcxproj.filters
浏览文件 @
41740e0f
...
...
@@ -151,6 +151,9 @@
<YASM
Include=
"..\libavcodec\x86\simple_idct10.asm"
>
<Filter>
Source Files\libavcodec\x86
</Filter>
</YASM>
<YASM
Include=
"..\libavcodec\x86\simple_idct.asm"
>
<Filter>
Source Files\libavcodec\x86
</Filter>
</YASM>
<YASM
Include=
"..\libavcodec\x86\videodsp.asm"
>
<Filter>
Source Files\libavcodec\x86
</Filter>
</YASM>
...
...
@@ -483,9 +486,6 @@
<ClCompile
Include=
"..\libavcodec\huffman.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\simple_idct.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\jrevdct.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
@@ -2787,6 +2787,9 @@
<ClCompile
Include=
"..\libavcodec\idctdsp.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\simple_idct.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\lossless_audiodsp.c"
>
<Filter>
Source Files\libavcodec
</Filter>
</ClCompile>
...
...
@@ -2901,9 +2904,6 @@
<ClCompile
Include=
"..\libavcodec\x86\cavsdsp.c"
>
<Filter>
Source Files\libavcodec\x86
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavcodec\x86\simple_idct.c"
>
<Filter>
Source Files\libavcodec\x86
</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude
Include=
"..\libavcodec\avcodec.h"
>
...
...
SMP/libavcodec/dce_defs.c
浏览文件 @
41740e0f
...
...
@@ -40,7 +40,7 @@
#include "libavcodec/vc1dsp.h"
#include "libavcodec/synth_filter.h"
#include "libavcodec/svq1enc.h"
#if !(ARCH_X86_64
||HAVE_MMX_INLINE||HAVE_SSE2_INLINE
)
#if !(ARCH_X86_64)
#include "libavcodec/x86/simple_idct.h"
#endif
#include "libavcodec/sbrdsp.h"
...
...
@@ -3548,21 +3548,6 @@ void ff_simple_idct12_put_sse2(uint8_t *dest, ptrdiff_t line_size, int16_t *bloc
#if !(ARCH_X86_64)
void
ff_simple_idct12_sse2
(
int16_t
*
block
)
{
return
;}
#endif
#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
;}
...
...
@@ -3662,8 +3647,6 @@ AVCodec ff_libopenjpeg_decoder = {0};
AVCodec
ff_libopenjpeg_encoder
=
{
0
};
AVCodec
ff_libopus_decoder
=
{
0
};
AVCodec
ff_librsvg_decoder
=
{
0
};
AVCodec
ff_libschroedinger_decoder
=
{
0
};
AVCodec
ff_libschroedinger_encoder
=
{
0
};
AVCodec
ff_libshine_encoder
=
{
0
};
AVCodec
ff_libtwolame_encoder
=
{
0
};
AVCodec
ff_libvo_amrwbenc_encoder
=
{
0
};
...
...
SMP/libavfilter.vcxproj
浏览文件 @
41740e0f
...
...
@@ -177,6 +177,7 @@
<ClCompile
Include=
"..\libavfilter\af_silenceremove.c"
/>
<ClCompile
Include=
"..\libavfilter\af_stereotools.c"
/>
<ClCompile
Include=
"..\libavfilter\af_stereowiden.c"
/>
<ClCompile
Include=
"..\libavfilter\af_surround.c"
/>
<ClCompile
Include=
"..\libavfilter\af_tremolo.c"
/>
<ClCompile
Include=
"..\libavfilter\af_vibrato.c"
/>
<ClCompile
Include=
"..\libavfilter\af_volumedetect.c"
/>
...
...
SMP/libavfilter.vcxproj.filters
浏览文件 @
41740e0f
...
...
@@ -354,6 +354,9 @@
<ClCompile
Include=
"..\libavfilter\af_stereowiden.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_surround.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
<ClCompile
Include=
"..\libavfilter\af_tremolo.c"
>
<Filter>
Source Files\libavfilter
</Filter>
</ClCompile>
...
...
SMP/libavformat/dce_defs.c
浏览文件 @
41740e0f
...
...
@@ -23,7 +23,5 @@
#include "libavformat/avformat.h"
AVInputFormat
ff_libnut_demuxer
=
{
0
};
AVInputFormat
ff_libopenmpt_demuxer
=
{
0
};
AVOutputFormat
ff_chromaprint_muxer
=
{
0
};
AVOutputFormat
ff_libnut_muxer
=
{
0
};
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录