[xiph-commits] r3296 - liboggz/trunk/src/liboggz

[conrad at svn.annodex.net]

Author: conrad
Date: 2007-12-07 01:52:26 -0800 (Fri, 07 Dec 2007)
New Revision: 3296

Modified:
   liboggz/trunk/src/liboggz/oggz_write.c
Log:
revert handling of cases where writing is stopped early (eg. by the user's
OggzWriteHungry callback returning OGGZ_STOP_OK). Fixes make check


Modified: liboggz/trunk/src/liboggz/oggz_write.c
===================================================================
--- liboggz/trunk/src/liboggz/oggz_write.c	2007-12-07 09:00:07 UTC (rev 3295)
+++ liboggz/trunk/src/liboggz/oggz_write.c	2007-12-07 09:52:26 UTC (rev 3296)
@@ -655,6 +655,7 @@
     oggz->cb_next = 0;
     writer->writing = 0;
     writer->no_more_packets = 0;
+    if (cb_ret == OGGZ_WRITE_EMPTY) cb_ret = 0;
     return oggz_map_return_value_to_error (cb_ret);
   }
 
@@ -667,6 +668,9 @@
           writer->flushing = 1;
           writer->no_more_packets = 1;
           cb_ret = OGGZ_CONTINUE;
+        } else {
+          active = 0;
+          break;
         }
       }
       if (oggz_page_init (oggz)) {
@@ -763,6 +767,9 @@
           writer->flushing = 1;
           writer->no_more_packets = 1;
           cb_ret = OGGZ_CONTINUE;
+        } else {
+          active = 0;
+          break;
         }
       }
       if (oggz_page_init (oggz)) {