Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-01 16:33:16 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-08-01 17:03:22 +0400
commit713dbe0655e4c3a906b0d812a6f90ac161223876 (patch)
treefbd605821f014cfd5405a90c7335af208d08d2e2 /.gitignore
parent9e052df86d522cddbddaafe584c2c8cf4d5f5032 (diff)
parent706208ef47bffd525c982975d2756f7b2b220b8d (diff)
Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'
* commit '706208ef47bffd525c982975d2756f7b2b220b8d': fate: Split fate-pixdesc tests and dispatch them through Make Conflicts: tests/fate-run.sh tests/ref/fate/filter-pixdesc Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 065fab1742..cb370bb9c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,7 @@
/tests/audiogen
/tests/base64
/tests/data/
+/tests/pixfmts.mak
/tests/rotozoom
/tests/tiny_psnr
/tests/tiny_ssim