[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric.carlson at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit af16e4aff0fb4c331e5719b46e4f57816d93317e
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 23 04:53:22 2009 +0000

    2009-09-22  Alpha Lam  <hclam at chromium.org>
    
            Reviewed by Eric Carlson.
    
            Media test files in Ogg and Theora formats
            https://bugs.webkit.org/show_bug.cgi?id=29623
    
            Adding test files for media layout tests in Ogg and Theora. They are transcoded
            from their originals in H264/AAC using ffmpeg2theora.
    
            * media/content/counting.ogv: Added.
            * media/content/empty.oga: Added.
            * media/content/garbage.ogv: Added.
            * media/content/silence.oga: Added.
            * media/content/test.oga: Added.
            * media/content/test.ogv: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48667 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9648f01..14ccb85 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2009-09-22  Alpha Lam  <hclam at chromium.org>
+
+        Reviewed by Eric Carlson.
+
+        Media test files in Ogg and Theora formats
+        https://bugs.webkit.org/show_bug.cgi?id=29623
+
+        Adding test files for media layout tests in Ogg and Theora. They are transcoded
+        from their originals in H264/AAC using ffmpeg2theora.
+
+        * media/content/counting.ogv: Added.
+        * media/content/empty.oga: Added.
+        * media/content/garbage.ogv: Added.
+        * media/content/silence.oga: Added.
+        * media/content/test.oga: Added.
+        * media/content/test.ogv: Added.
+
 2009-09-22  Drew Wilson  <atwilson at google.com>
 
         Reviewed by David Levin.
diff --git a/LayoutTests/media/content/counting.ogv b/LayoutTests/media/content/counting.ogv
new file mode 100644
index 0000000..ce03c19
Binary files /dev/null and b/LayoutTests/media/content/counting.ogv differ
diff --git a/BugsSite/data/mail b/LayoutTests/media/content/empty.oga
similarity index 100%
copy from BugsSite/data/mail
copy to LayoutTests/media/content/empty.oga
diff --git a/LayoutTests/media/content/garbage.mp4 b/LayoutTests/media/content/garbage.ogv
similarity index 100%
copy from LayoutTests/media/content/garbage.mp4
copy to LayoutTests/media/content/garbage.ogv
diff --git a/LayoutTests/media/content/silence.oga b/LayoutTests/media/content/silence.oga
new file mode 100644
index 0000000..af59188
Binary files /dev/null and b/LayoutTests/media/content/silence.oga differ
diff --git a/LayoutTests/media/content/test.oga b/LayoutTests/media/content/test.oga
new file mode 100644
index 0000000..4544688
Binary files /dev/null and b/LayoutTests/media/content/test.oga differ
diff --git a/LayoutTests/media/content/test.ogv b/LayoutTests/media/content/test.ogv
new file mode 100644
index 0000000..c9ee910
Binary files /dev/null and b/LayoutTests/media/content/test.ogv differ

-- 
WebKit Debian packaging