# HG changeset patch
# User nenolod
# Date 1173083332 28800
# Node ID 6f519e34ddf089eed2cf270318e768216b7ac26e
# Parent  87bd9a74ca4f4291f298ae6c8963002a93ae3cbc
[svn] - reject files which use Ogg container magic

diff -r 87bd9a74ca4f -r 6f519e34ddf0 ChangeLog
--- a/ChangeLog	Sun Mar 04 17:32:01 2007 -0800
+++ b/ChangeLog	Mon Mar 05 00:28:52 2007 -0800
@@ -1,3 +1,10 @@
+2007-03-05 01:32:01 +0000  Giacomo Lozito <james@develia.org>
+  revision [1660]
+  - aosd: remove no-longer-needed inclusion of pthread.h from aosd_osd.c
+  trunk/src/aosd/aosd_osd.c |    1 -
+  1 file changed, 1 deletion(-)
+
+
 2007-03-05 00:45:52 +0000  Giacomo Lozito <james@develia.org>
   revision [1658]
   - aosd: experimental single-threaded osd; now the osd works in the same thread of the player, thus issues related to cairo and pango hopefully should go away; further testing on different system is required
diff -r 87bd9a74ca4f -r 6f519e34ddf0 src/madplug/plugin.c
--- a/src/madplug/plugin.c	Sun Mar 04 17:32:01 2007 -0800
+++ b/src/madplug/plugin.c	Mon Mar 05 00:28:52 2007 -0800
@@ -247,6 +247,8 @@
 
     if (memcmp(buf, "ID3", 3) == 0)
         return 1;
+    else if (memcmp(buf, "OggS", 4) == 0)
+        return 0;
     else if (memcmp(buf, "RIFF", 4) == 0)
     {
         vfs_fseek(fin, 4, SEEK_CUR);