[FFmpeg-cvslog] fate/avfilter: honor GPL dependency.

Clément Bœsch git at videolan.org
Tue Nov 13 09:17:16 CET 2012


ffmpeg | branch: master | Clément Bœsch <clement.boesch at smartjog.com> | Tue Nov 13 10:12:58 2012 +0200| [f6f52936bea1c880b9c5286d2a12f5703c47bc85] | committer: Clément Bœsch

fate/avfilter: honor GPL dependency.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6f52936bea1c880b9c5286d2a12f5703c47bc85
---

 tests/fate/avfilter.mak |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak
index 239fe64..9a59251 100644
--- a/tests/fate/avfilter.mak
+++ b/tests/fate/avfilter.mak
@@ -2,8 +2,6 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb                                \
              fate-lavfi-alphaextract_yuv                                \
              fate-lavfi-alphamerge_rgb                                  \
              fate-lavfi-alphamerge_yuv                                  \
-             fate-lavfi-colormatrix1                                    \
-             fate-lavfi-colormatrix2                                    \
              fate-lavfi-crop                                            \
              fate-lavfi-crop_scale                                      \
              fate-lavfi-crop_scale_vflip                                \
@@ -24,7 +22,6 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb                                \
              fate-lavfi-pixfmts_pad                                     \
              fate-lavfi-pixfmts_pixdesctest                             \
              fate-lavfi-pixfmts_scale                                   \
-             fate-lavfi-pixfmts_super2xsai                              \
              fate-lavfi-pixfmts_vflip                                   \
              fate-lavfi-scale200                                        \
              fate-lavfi-scale500                                        \
@@ -35,14 +32,18 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb                                \
              fate-lavfi-testsrc                                         \
              fate-lavfi-thumbnail                                       \
              fate-lavfi-tile                                            \
-             fate-lavfi-tinterlace_merge                                \
-             fate-lavfi-tinterlace_pad                                  \
              fate-lavfi-transpose                                       \
              fate-lavfi-unsharp                                         \
              fate-lavfi-vflip                                           \
              fate-lavfi-vflip_crop                                      \
              fate-lavfi-vflip_vflip                                     \
 
+FATE_LAVFI-$(CONFIG_GPL) += fate-lavfi-colormatrix1                     \
+                            fate-lavfi-colormatrix2                     \
+                            fate-lavfi-pixfmts_super2xsai               \
+                            fate-lavfi-tinterlace_merge                 \
+                            fate-lavfi-tinterlace_pad                   \
+
 FATE_LAVFI-$(CONFIG_MP_FILTER) += fate-lavfi-pp                         \
              fate-lavfi-pp2                                             \
              fate-lavfi-pp3                                             \



More information about the ffmpeg-cvslog mailing list