提交 a6b1dda1 编写于 作者: M Matt Oliver

projects: Update for recent upstream merge.

上级 75673eae
......@@ -1608,9 +1608,11 @@
%define CONFIG_PSNR_FILTER 1
%define CONFIG_PULLUP_FILTER 1
%define CONFIG_QP_FILTER 1
%define CONFIG_RANDOM_FILTER 1
%define CONFIG_REMOVEGRAIN_FILTER 1
%define CONFIG_REMOVELOGO_FILTER 1
%define CONFIG_REPEATFIELDS_FILTER 1
%define CONFIG_REVERSE_FILTER 1
%define CONFIG_ROTATE_FILTER 1
%define CONFIG_SAB_FILTER 1
%define CONFIG_SCALE_FILTER 1
......
......@@ -1655,9 +1655,11 @@
#define CONFIG_PSNR_FILTER 1
#define CONFIG_PULLUP_FILTER 1
#define CONFIG_QP_FILTER 1
#define CONFIG_RANDOM_FILTER 1
#define CONFIG_REMOVEGRAIN_FILTER 1
#define CONFIG_REMOVELOGO_FILTER 1
#define CONFIG_REPEATFIELDS_FILTER 1
#define CONFIG_REVERSE_FILTER 1
#define CONFIG_ROTATE_FILTER 1
#define CONFIG_SAB_FILTER 1
#define CONFIG_SCALE_FILTER 1
......
......@@ -372,6 +372,8 @@
</ClCompile>
<ClCompile Include="..\libavfilter\vf_qp.c">
</ClCompile>
<ClCompile Include="..\libavfilter\vf_random.c">
</ClCompile>
<ClCompile Include="..\libavfilter\vf_removegrain.c">
<ObjectFileName>$(IntDir)\libavfilter_vf_removegrain.obj</ObjectFileName>
</ClCompile>
......@@ -381,6 +383,8 @@
</ClCompile>
<ClCompile Include="..\libavfilter\vf_repeatfields.c">
</ClCompile>
<ClCompile Include="..\libavfilter\vf_reverse.c">
</ClCompile>
<ClCompile Include="..\libavfilter\vf_rotate.c">
</ClCompile>
<ClCompile Include="..\libavfilter\vf_separatefields.c">
......
......@@ -497,6 +497,9 @@
<ClCompile Include="..\libavfilter\vf_qp.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_random.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_removegrain.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......@@ -509,6 +512,9 @@
<ClCompile Include="..\libavfilter\vf_repeatfields.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_reverse.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
<ClCompile Include="..\libavfilter\vf_rotate.c">
<Filter>Source Files\libavfilter</Filter>
</ClCompile>
......
#ifndef AVUTIL_FFVERSION_H
#define AVUTIL_FFVERSION_H
#define FFMPEG_VERSION "2.6.git"
#define FFMPEG_VERSION "2.7.git"
#endif /* AVUTIL_FFVERSION_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册