X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=8376b652d15eb690e91e86163045af334ef7cf07;hp=2837db61c7de43a732564c8d46fec14ef6b4331e;hb=d4b040af5e31260dbf71f4547484179f32be4746;hpb=f0c195e0ee6baefae0046db0e10df2e45f72ca41

diff --git a/ogg_afh.c b/ogg_afh.c
index 2837db61..8376b652 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -105,7 +105,6 @@ static int vorbis_get_header_callback(ogg_packet *packet, int packet_num,
 		return 0;
 	if (packet_num == 0) {
 		ogg_stream_init(&vghd->os, serial);
-		ret = -E_OGG_PACKET_IN;
 		ret = ogg_stream_packetin(&vghd->os, packet);
 		if (ret < 0)
 			goto out;
@@ -116,8 +115,8 @@ static int vorbis_get_header_callback(ogg_packet *packet, int packet_num,
 		return 1;
 	}
 	if (packet_num == 1) {
-		PARA_INFO_LOG("replacing metadata packet\n");
 		ogg_packet replacement = *packet;
+		PARA_INFO_LOG("replacing metadata packet\n");
 		replacement.packet = dummy_packet;
 		replacement.bytes = sizeof(dummy_packet);
 		ret = ogg_stream_packetin(&vghd->os, &replacement);
@@ -129,10 +128,8 @@ static int vorbis_get_header_callback(ogg_packet *packet, int packet_num,
 	ret = -E_OGG_PACKET_IN;
 	if (ogg_stream_packetin(&vghd->os, packet) < 0)
 		goto out;
-	ret = -E_OGG_STREAM_FLUSH;
-	if (ogg_stream_flush(&vghd->os, &og) == 0)
-		goto out;
-	add_ogg_page(&og, vghd);
+	while (ogg_stream_flush(&vghd->os, &og))
+		add_ogg_page(&og, vghd);
 	ret = 0;
 out:
 	ogg_stream_clear(&vghd->os);