Bug 450891 - Stop liboggz writing debug to stdout - rs=roc

media/liboggz/README_MOZILLA

@@ -7,3 +7,8 @@ Mozilla build system.
 The seek.patch address a bug in liboggz when a seek call returns an
 error. It also addresses an issue where the guess for the seek
 position can exceed the file size. These will be upstreamed to liboggz.
+
+The warning.patch addresses a printf in liboggz that is not wrapped
+in a DEBUG #ifdef. See Mozilla bug 450891 and Annodex ticket 431:
+
+http://trac.annodex.net/ticket/431

media/liboggz/src/liboggz/oggz_auto.c

@@ -809,10 +809,12 @@ auto_calc_vorbis(ogg_int64_t now, oggz_stream_t *stream, ogg_packet *op) {
       }
       
       size_check += 1;
+#ifdef DEBUG
       if (size_check != size)
       {
         printf("WARNING: size parsing failed for VORBIS mode packets\n");
       }
+#endif
 
       /*
        * store mode size information in our info struct

media/liboggz/update.sh

@@ -41,4 +41,5 @@ sed s/\#include\ \"config.h\"/\#ifdef\ WIN32\\n\#include\ \"config_win32.h\"\\n\
 cp $1/src/liboggz/oggz_dlist.h ./src/liboggz/oggz_dlist.h
 sed s/\#include\ \"config.h\"/\#ifdef\ WIN32\\n\#include\ \"config_win32.h\"\\n\#else\\n\#include\ \"config.h\"\\n\#endif/g $1/src/liboggz/metric_internal.c >./src/liboggz/metric_internal.c
 cp $1/AUTHORS ./AUTHORS
-patch -p4 <seek.patch
+patch -p4 <seek.patch
+patch -p4 <warning.patch

media/liboggz/warning.patch

@@ -0,0 +1,17 @@
+diff --git a/media/liboggz/src/liboggz/oggz_auto.c b/media/liboggz/src/liboggz/oggz_auto.c
+index 6d83fa9..95ffe6c 100644
+--- a/media/liboggz/src/liboggz/oggz_auto.c
++++ b/media/liboggz/src/liboggz/oggz_auto.c
+@@ -809,10 +809,12 @@ auto_calc_vorbis(ogg_int64_t now, oggz_stream_t *stream, ogg_packet *op) {
+       }
+       
+       size_check += 1;
++#ifdef DEBUG
+       if (size_check != size)
+       {
+         printf("WARNING: size parsing failed for VORBIS mode packets\n");
+       }
++#endif
+ 
+       /*
+        * store mode size information in our info struct